Commit graph

6279 commits

Author SHA1 Message Date
Richard Peter
17c2c42cd2 Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
Former-commit-id: ab7facb903 [formerly 4ba39c5e56] [formerly 008a3e8f80 [formerly 5bb3f4a1215902e867d3e9ec5ca1d122067afd7e]]
Former-commit-id: 008a3e8f80
Former-commit-id: 2dd7596b68
2014-08-25 14:24:27 -05:00
Ron Anderson
fe93cb7510 Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
Former-commit-id: 03173a9fe7 [formerly 4e6bbb4be4] [formerly 4285719a08 [formerly ae980bfccfedab3091b2708fae0dc36764dbffcb]]
Former-commit-id: 4285719a08
Former-commit-id: 6c3cafda59
2014-08-25 14:04:41 -05:00
Brian Clements
253b14b895 Issue #3500 back port of loadConfig.py to fix gfe starup issue
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7

Former-commit-id: 960eb2dc29 [formerly 4314f71387] [formerly cf671dcda8 [formerly 2a0af03242692708b3e752417ca7d60d28520768]]
Former-commit-id: cf671dcda8
Former-commit-id: f9756abf0a
2014-08-25 13:34:36 -05:00
Roger Ferrel
3d3f9cfb8c Issue #3537 Fixed dirPattern in category Local.
Former-commit-id: 1ff321ce51 [formerly c7a6040792] [formerly e451dd2814 [formerly d40736ed992300be32ed4a62511fa436e9d167af]]
Former-commit-id: e451dd2814
Former-commit-id: 6f566c0f38
2014-08-25 13:23:44 -05:00
Nate Jensen
d824e365d1 Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
Former-commit-id: 0852d804ba [formerly 5e46c55a76] [formerly d66ac29640 [formerly bb08cb510dc3d774e040b7d3a164dfa1d581aa1c]]
Former-commit-id: d66ac29640
Former-commit-id: 5c943c5ddc
2014-08-25 13:12:46 -05:00
Steve Harris
28937f26bc Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
Former-commit-id: 8aadfe944a [formerly a03b5201cb] [formerly d850919303 [formerly 67c81cedb7321baad8dcf5fb4cea21ac152d2dcd]]
Former-commit-id: d850919303
Former-commit-id: 121a8ce866
2014-08-25 08:19:50 -05:00
Brian.Dyke
caa50716ff Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a841eb53e5 [formerly a4376ec79f] [formerly 0fbc5269ea [formerly e673b3ff82b52be4cd4fbe2dab0859b98678f6ef]]
Former-commit-id: 0fbc5269ea
Former-commit-id: 13d523eede
2014-08-22 16:40:51 -04:00
Brian.Dyke
c8e9153884 Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]
Former-commit-id: dd9d7133d9
Former-commit-id: 1839b614df
2014-08-22 14:16:22 -04:00
Brian.Dyke
0cbbceb7e3 Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 5b2b0d2bd9 [formerly a830b6d94c] [formerly 94577a1626 [formerly b2674ef57183706feb2bb17175d730bb2e213281]]
Former-commit-id: 94577a1626
Former-commit-id: a0af10ff2e
2014-08-22 14:13:48 -04:00
Richard Peter
a1abde3669 Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b

Former-commit-id: 4cebb22560 [formerly ce238544d1] [formerly a9af2314d3 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]
Former-commit-id: a9af2314d3
Former-commit-id: 7c74a4110e
2014-08-22 10:47:05 -05:00
steve.naples
a3443402f2 ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41

Former-commit-id: 1bde9a4013 [formerly c2bb43944c] [formerly 7690281c5c [formerly e719245823220d7b583ffdb0adc88c8b71321369]]
Former-commit-id: 7690281c5c
Former-commit-id: 560cf97a6f
2014-08-22 15:21:35 +00:00
Brian Clements
d2c4e847ba Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: bcc3e405e5 [formerly d62db22874] [formerly 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]
Former-commit-id: 9f7905b58d
Former-commit-id: 561977ecba
2014-08-22 08:56:56 -05:00
Brian.Dyke
e3385e4685 Merge branch 'master_14.2.4' into master_14.3.1
Former-commit-id: 7ac47f5f03 [formerly 88641b69f1] [formerly 412d44847c [formerly c4e9d3ff0cf7bd4f12c1a8d886b568eb7a8ff97a]]
Former-commit-id: 412d44847c
Former-commit-id: 5ff8e3dd49
2014-08-21 15:49:49 -04:00
Brian.Dyke
5b188a713b Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f6748f1e28 [formerly 14d21b336d] [formerly aaabfa6cd0 [formerly 614b2bb59424f01d2608cd2db3a14dbcd77c90e6]]
Former-commit-id: aaabfa6cd0
Former-commit-id: d419fc59ff
2014-08-21 12:07:16 -04:00
Brian.Dyke
17b9ae1418 VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: 93be1a54c7 [formerly 7b8fef0fa3] [formerly ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]]
Former-commit-id: ae5656ca46
Former-commit-id: bcf53f53da
2014-08-21 11:07:02 -04:00
Qinglu.Lin
787f157850 ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: 3cc94603a2 [formerly fb92838427] [formerly 2157a4aa3b [formerly b8a4741b2519e8c02a1b80ba8544be9b1c26d35c]]
Former-commit-id: 2157a4aa3b
Former-commit-id: 3037a17366
2014-08-21 10:43:22 -04:00
Zihou Wang
698321896d VLab Issue #4464 - DR_17214 RADAR: NEXRAD Unit Status display problem due to the GSM change; fixes #4464
Change-Id: I0ca330e385000e04ef21142e75adfc55d4615a89

Former-commit-id: dde3ee4904 [formerly 3ffac397db] [formerly a2a2a8cdf9 [formerly 288dc7c439995a8ab48680832b63f7d6974885b4]]
Former-commit-id: a2a2a8cdf9
Former-commit-id: 0785965b62
2014-08-21 12:04:30 +00:00
Rici.Yu
da7fa2e13e ASM #15084 - check in files for DCS 25
Change-Id: I956d9f5175e8beb3d52db89035251add51973dda

Former-commit-id: 30aaafc702 [formerly ae581dc444] [formerly e5c4562e83 [formerly eb85d059b64d9c2a41014d8f1762a61e58a5226b]]
Former-commit-id: e5c4562e83
Former-commit-id: 4f4e2b5b34
2014-08-20 16:52:08 -04:00
steve.naples
57396fa455 ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69

Former-commit-id: 765fa2dc4e [formerly 179031d9b4] [formerly 4be6abad1b [formerly 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b]]
Former-commit-id: 4be6abad1b
Former-commit-id: cb000115cb
2014-08-20 17:17:14 +00:00
Ron Anderson
11dd687ef7 Issue #3526 Fix bug in WECache that caused ISC grids to be removed
Change-Id: I49feb0d093a75c83b9a09deeed15e81cf0ed967b

Former-commit-id: a19f819e44 [formerly 62236ee92a] [formerly 8c4cb3b4ae [formerly edd1c5d77ec7a84b5807134d863d59147a846405]]
Former-commit-id: 8c4cb3b4ae
Former-commit-id: a41384e4d6
2014-08-20 11:03:03 -05:00
Zihou Wang
c7cb18c58a VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; fixes #3990
Change-Id: Ib6be85a3fb40649a093c8cd5d9278f324edb3a7f

Former-commit-id: 3fa6a7840e [formerly 9b68bea7c3] [formerly 45d8572343 [formerly 3d305bffddf34d38b65176280e40709549f09ee5]]
Former-commit-id: 45d8572343
Former-commit-id: bf7d95c9b4
2014-08-20 14:20:17 +00:00
David Friedman
95fbbdf730 ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: b053e1e2ce [formerly 78ee5a56c5] [formerly 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]]
Former-commit-id: 6a7638ddae
Former-commit-id: 76d78ff72e
2014-08-20 14:13:32 +00:00
Roger Ferrel
09f4d1b53b Issue #3439 Name change per suggestions in email.
Former-commit-id: d76722987e [formerly fb54b80ed5] [formerly f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]
Former-commit-id: f110ca1f3d
Former-commit-id: 9adb8c5d35
2014-08-19 16:41:06 -05:00
Steve Harris
e80723bcd4 Merge branch 'master_14.2.2' (14.2.2-27,28) into omaha_14.2.2
Former-commit-id: c998370edd [formerly 0d6d3bd7f5] [formerly 5dd1435a5e [formerly 8f436bd859a52374fe5788102465a6a20355fda2]]
Former-commit-id: 5dd1435a5e
Former-commit-id: c250de9a96
2014-08-19 12:38:53 -05:00
Slav Korolev
d080af879e Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]
Former-commit-id: a779c786f1
Former-commit-id: 407be3d26f
2014-08-19 10:12:36 -05:00
Brian Clements
f6a9a13142 Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: 9e33cf1f5f [formerly 78796c3f6e] [formerly fc2e7f52b9 [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]
Former-commit-id: fc2e7f52b9
Former-commit-id: f593f8a78d
2014-08-19 09:00:58 -05:00
Richard Peter
a5aee36fd2 Merge "Issue #2875 - re-compile grib2.so with g2clib changes" into omaha_14.2.4
Former-commit-id: 31ea5b534c [formerly cae1c14c01] [formerly 65942275df [formerly a9fef10a950d5f138088dce74b1709a25eb5cdfa]]
Former-commit-id: 65942275df
Former-commit-id: 38f9f3a739
2014-08-19 08:58:23 -05:00
Nate Jensen
06881679ba Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: 2ef19db3b7 [formerly f9036405d6] [formerly 7c4a57e518 [formerly fe105be09b018efb625194f692ae9686a898981e]]
Former-commit-id: 7c4a57e518
Former-commit-id: 438bcc8d90
2014-08-19 08:37:47 -05:00
Nate Jensen
d0d0ecc38e Merge "Issue #3500 added bundle loader synchronization" into omaha_14.2.4
Former-commit-id: 178236b9c7 [formerly 15b7d9a39b] [formerly f14b66d040 [formerly 20431b0b036c3386f0f471887ebaeac5940463e4]]
Former-commit-id: f14b66d040
Former-commit-id: b6d5713123
2014-08-19 08:37:35 -05:00
Steve Harris
eeb928761d Issue #2875 - re-compile grib2.so with g2clib changes
This reverts commit b7e05d94f9a8d00d081605a63fbe96f098aa35cd [formerly fab7989b69] [formerly 68d2d83309 [formerly 2c7e22f825] [formerly fab7989b69 [formerly 96094af605a2a303d440f009b25dd9740194a5ca]]].


Former-commit-id: 7fa6315202 [formerly 5f6a29c515] [formerly cddc961f2c [formerly 2b1665a1d9a1314bb6b0012161a6409ca2e6ebf8]]
Former-commit-id: cddc961f2c
Former-commit-id: 2ce04bce32
2014-08-19 08:18:11 -05:00
Brian.Dyke
331cb68011 VLab Issue #3617 - DCS_266 Ingest & Display HRRR - LevelMappingFile.xml
Former-commit-id: 0c10dc2ee0 [formerly f52f2b1c25] [formerly aa6e025b14 [formerly 93c1663761e65e870262bc4fdf4028b08e20c85a]]
Former-commit-id: aa6e025b14
Former-commit-id: 02e1b34afb
2014-08-18 14:18:05 -04:00
Brian.Dyke
41e9db65a4 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 3bba82c371 [formerly ef9ddd0f98] [formerly ca564e58ea [formerly 3c1db35ef591bfe9c5124ad9c4c801d6acbdb8f8]]
Former-commit-id: ca564e58ea
Former-commit-id: 5676e51dc3
2014-08-18 13:17:13 -04:00
Brian.Dyke
1d297de174 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 2054d6f844 [formerly 9a212410b5] [formerly d82d58d38e [formerly 5c9880c3179bf376798bb5658aec3666bddd7d3e]]
Former-commit-id: d82d58d38e
Former-commit-id: 9b1b39f3be
2014-08-18 11:47:38 -04:00
Brian.Dyke
c6346336c0 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: f33e622e9d [formerly 0bdacc25f6] [formerly 4d47e00887 [formerly 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee]]
Former-commit-id: 4d47e00887
Former-commit-id: 0e7c221bd7
2014-08-18 10:20:49 -04:00
Melissa Porricel
248205a78f ASM #15699 - Fix Grib decoder error
Change-Id: Ieabe763de544960f6e7bae0e2cf940eaa2493511

Former-commit-id: 9f20c63f97 [formerly 67e44f145a] [formerly 7e78946ee0 [formerly e8c156d166cedc1553f9ffd8867633651443872d]]
Former-commit-id: 7e78946ee0
Former-commit-id: 356d0e04f6
2014-08-15 13:41:53 -04:00
Zihou Wang
cac176920d VLab Issue #3990 - DR_17356 Enhancement to Radar Display of SAILS 0.5 degree products; closes #3990
Change-Id: I2af5cb375294163d9c20ac7342ef72ebaa6c51ce

Former-commit-id: 2fd6278cf3 [formerly e9f78d8f52] [formerly f54da5f6ae [formerly f61e935c0372ee19768f2080da1f8fa21fb9aeb1]]
Former-commit-id: f54da5f6ae
Former-commit-id: 065f2d9996
2014-08-15 11:04:39 -05:00
Ana Rivera
706336e633 VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e

Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 11073fdece [formerly 9ada9356c5] [formerly 4c585af933 [formerly 7fa5b7a34613e88a77e4b32c79c6d8c3c6166ba2]]
Former-commit-id: 4c585af933
Former-commit-id: b5e6172652
2014-08-15 11:04:23 -05:00
Stephen Gilbert
b20d517e3f VLab Issue #3648 - Corrected NCEP additions for ESTOFS model
Change-Id: I0824e9ebabb4cd0884f202899321f2a05198627b

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Former-commit-id: 84c3e1ed26 [formerly f6225b8969] [formerly 77fa357a15 [formerly aef15e75c53666aa65dd4687725e9dbd8e6122e0]]
Former-commit-id: 77fa357a15
Former-commit-id: 333f24b12f
2014-08-15 11:03:48 -05:00
Fay.Liang
6565ac4583 ASM #600 - the fixes for DR 17380
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: c2dd7c183f [formerly f5901b8ede] [formerly 77a6ab632f [formerly 89c29c1228830d301b7046ebb7d4281666c2b768]]
Former-commit-id: 77a6ab632f
Former-commit-id: 8fb443033e
2014-08-15 11:03:15 -05:00
Ana Rivera
c294608c37 VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1daa44291e [formerly a44d5d91db] [formerly 9bf2df23be [formerly b7815d59250a73ee587d57bd2ece84691fe8707c]]
Former-commit-id: 9bf2df23be
Former-commit-id: eefe73ee51
2014-08-15 11:02:36 -05:00
David Friedman
95d472a5ce ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c

Former-commit-id: 5604904fc8 [formerly 913330902d] [formerly 62f152ad70 [formerly b3947c58da51f964032e9539c010030c2cbe0731]]
Former-commit-id: 62f152ad70
Former-commit-id: 85eae0a58c
2014-08-15 11:01:42 -05:00
Qinglu.Lin
d7cd89c6e1 ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5

Former-commit-id: 8693097b0b [formerly 9a9e32dc53] [formerly ff551ea143 [formerly bafc616881af28b5397c45c5155a3c812a9c048d]]
Former-commit-id: ff551ea143
Former-commit-id: c1d6719956
2014-08-15 11:01:30 -05:00
Ana Rivera
dab9e1379a VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: cc354742e1 [formerly a053fd5bad] [formerly 95451b2959 [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]
Former-commit-id: 95451b2959
Former-commit-id: 236a089297
2014-08-15 11:01:23 -05:00
Kiran.Shrestha
e0f6a03aa4 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b

Former-commit-id: d307a6aa9c [formerly e7173dd45a] [formerly ca120a4106 [formerly b83aef5ef55a58d9f267fd7a80184482d1e5d092]]
Former-commit-id: ca120a4106
Former-commit-id: 8686e58440
2014-08-15 11:00:19 -05:00
Loubna.Bousaidi
d9be7127bc ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: afae4700a6 [formerly 8c15d1f124] [formerly d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]
Former-commit-id: d41e489ced
Former-commit-id: 5cc9b08890
2014-08-15 10:54:10 -05:00
Loubna.Bousaidi
5c83a66633 ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Former-commit-id: 8038fc4a8d [formerly e109528caf] [formerly 213773cde4 [formerly d1d86dd82bfa114bf181de5cf993f2bed349ada5]]
Former-commit-id: 213773cde4
Former-commit-id: 3c130d0007
2014-08-15 10:53:47 -05:00
Brian.Dyke
d0985451d7 Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: a73c8d4cda [formerly 8b1b457310] [formerly d3888b16f3 [formerly bdfe1c263b8bcc0f6ebc8fd31c506e76271319ea]]
Former-commit-id: d3888b16f3
Former-commit-id: 89941d5ca9
2014-08-15 11:52:35 -04:00
Michael Gamazaychikov
ab21a0f8e9 ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805

Former-commit-id: 2b450af136 [formerly 9897417235] [formerly c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]]
Former-commit-id: c14a5287ac
Former-commit-id: 4097a7ddd0
2014-08-15 11:03:23 -04:00
Nate Jensen
4b114ba79b Issue #3524 ensure apache httpclient always sends credentials with https
requests

Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c

Former-commit-id: 6907c5a1cf [formerly 5bcddf1af1] [formerly 9ddde59743 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]]
Former-commit-id: 9ddde59743
Former-commit-id: 97109d5864
2014-08-15 09:15:11 -05:00
Brian Clements
3ab0fae7fc Issue #3510 added optimizations to GLDisposalManager
Change-Id: I07a443135d1f02beba7a2f9d097b9198f3484506

Former-commit-id: d8d80bea6d [formerly 5aa1830c3d] [formerly 0549972008 [formerly 0dc59ef89147bd4eb2b40f6c99c5e3422555cf65]]
Former-commit-id: 0549972008
Former-commit-id: b4ea365860
2014-08-15 08:48:02 -05:00