Commit graph

175 commits

Author SHA1 Message Date
Steve Harris
cf2e045de3 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: da530db540 [formerly 091555cf10]
Former-commit-id: da530db540
Former-commit-id: e3a7796362
2014-09-19 10:28:57 -05:00
mjames-upc
074aefd47b feature updates for warngen putback
Former-commit-id: 382f22f438
2014-09-10 15:09:58 -06:00
Max Schenkelberg
994605c1ce Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 154c4ac7131ae8f533d4080055d9afe257bf0506
2014-09-10 15:43:19 -05:00
Max Schenkelberg
422ceffbdd Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]
Former-commit-id: 3ea9b1b4be
2014-09-10 15:43:19 -05:00
Max Schenkelberg
637d1617d1 Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 994605c1ce [formerly 422ceffbdd [formerly 3ea9b1b4be] [formerly 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 422ceffbdd [formerly 3ea9b1b4be]
Former-commit-id: 422ceffbdd
Former-commit-id: 740d777efc
2014-09-10 15:43:19 -05:00
Brian.Dyke
01dfe503f5 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
Brian.Dyke
fe85eb9f70 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Brian.Dyke
e6457a002e Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: fe85eb9f70 [formerly 3d9a3de6e4]
Former-commit-id: fe85eb9f70
Former-commit-id: d8271549ff
2014-09-09 11:44:30 -04:00
Brian Clements
cfeb16eff8 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: b3482522860408c2d052261e845899cf73c2ce96
2014-08-29 08:55:58 -05:00
Brian Clements
981390eb22 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]
Former-commit-id: b352bd3944
2014-08-29 08:55:58 -05:00
Brian Clements
16422cd607 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly 981390eb22 [formerly b352bd3944] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]
Former-commit-id: 981390eb22 [formerly b352bd3944]
Former-commit-id: 981390eb22
Former-commit-id: c0b132d6ee
2014-08-29 08:55:58 -05:00
Nate Jensen
fdc4cc60b9 Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: 263452a82aef4756492fe02156525137b5ca09ff
2014-08-26 16:45:00 -05:00
Nate Jensen
f84e89b694 Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]
Former-commit-id: dbbf012a34
2014-08-26 16:45:00 -05:00
Nate Jensen
482d090c44 Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: fdc4cc60b9 [formerly f84e89b694 [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]
Former-commit-id: f84e89b694 [formerly dbbf012a34]
Former-commit-id: f84e89b694
Former-commit-id: 4a48867a81
2014-08-26 16:45:00 -05:00
Brian Clements
9f7905b58d 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: b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684
2014-08-22 08:56:56 -05:00
Brian Clements
bcc3e405e5 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: 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]
Former-commit-id: d62db22874
2014-08-22 08:56:56 -05:00
Brian Clements
9b0a34c5e3 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: 9f7905b58d [formerly bcc3e405e5 [formerly d62db22874] [formerly 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]]]
Former-commit-id: bcc3e405e5 [formerly d62db22874]
Former-commit-id: bcc3e405e5
Former-commit-id: d3f0f7dea4
2014-08-22 08:56:56 -05:00
mjames-upc
055edc5405 CAVE plugin edits for menu removal: archive, textworkstation, useradmin, datadelivery, collab. Icon updates as well.
Former-commit-id: d7525aa414
2014-07-27 16:14:29 -06:00
mjames-upc
4547d69d7d tray icons
Former-commit-id: 21a1df1fce
2014-07-17 10:04:45 -06:00
mjames-upc
969312e200 various build updates, feature muting, NCP viz edits, icon updates
Former-commit-id: 04b06dad08
2014-07-16 20:12:19 -06:00
mjames-upc
bf9ae595da change alertviz dialog default behavior to hide on startup; reconnect notification manager
Former-commit-id: 1ec9f4f2fa
2014-05-29 14:15:52 -06:00
mjames-upc
2c4d5181b5 set AlertVizDialog visibility to false by default
Former-commit-id: dd0ff65c82
2014-05-14 12:30:29 -06:00
mjames-upc
b4c0da1971 first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
2014-04-30 19:22:58 -06:00
Max Schenkelberg
cc2080449c Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: b65366dcdfa48e431b5c8bf10a72879b111cfd8d
2014-01-06 17:03:45 -06:00
Max Schenkelberg
b3aed99142 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: 16046a4dde
2014-01-06 17:03:45 -06:00
Max Schenkelberg
4adb40e333 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: b3aed99142 [formerly 16046a4dde]
Former-commit-id: b3aed99142
Former-commit-id: 30059d255c
2014-01-06 17:03:45 -06:00
Steve Harris
64f8564cd8 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 71a8fd9b0659b06e366e734c06fa74232787238b
2013-12-18 13:14:27 -06:00
Steve Harris
8aac57e096 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 64f8564cd8 [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]
Former-commit-id: 0950a8a1ba
2013-12-18 13:14:27 -06:00
Steve Harris
3f5bf52332 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 64f8564cd8 [formerly 8aac57e096 [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 8aac57e096 [formerly 0950a8a1ba]
Former-commit-id: 8aac57e096
Former-commit-id: 36b228cc7f
2013-12-18 13:14:27 -06:00
Ben Steffensmeier
922674273e Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: 41f4a0a6050319adf27f3656b665a2fb011b849c
2013-12-11 12:45:11 -06:00
Ben Steffensmeier
bf508b4455 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]
Former-commit-id: a37db9d1b4
2013-12-11 12:45:11 -06:00
Ben Steffensmeier
b0d5dbddf4 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: 922674273e [formerly bf508b4455 [formerly a37db9d1b4] [formerly 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: bf508b4455 [formerly a37db9d1b4]
Former-commit-id: bf508b4455
Former-commit-id: c92b5842ab
2013-12-11 12:45:11 -06:00
Max Schenkelberg
987d4b3a30 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 520e22dd848cf6472232d60789e1f6938db7c776
2013-12-09 15:14:01 -06:00
Max Schenkelberg
be45102814 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]
Former-commit-id: 9d846aa104
2013-12-09 15:14:01 -06:00
Max Schenkelberg
2342017e93 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 987d4b3a30 [formerly be45102814 [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: be45102814 [formerly 9d846aa104]
Former-commit-id: be45102814
Former-commit-id: 0084b5b4f1
2013-12-09 15:14:01 -06:00
Nate Jensen
78b01f61c4 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 264b7c80cbd0559c175aef0a99d8f8407b6af7d0
2013-11-14 17:41:24 -06:00
Nate Jensen
757ca42a5f Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]
Former-commit-id: dd99aa3f47
2013-11-14 17:41:24 -06:00
Nate Jensen
202049009d Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 78b01f61c4 [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 757ca42a5f [formerly dd99aa3f47]
Former-commit-id: 757ca42a5f
Former-commit-id: 462878bf86
2013-11-14 17:41:24 -06:00
Nate Jensen
938e4a3073 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 15c1452f6970515d91b5bcc0c75de1679f561c87
2013-10-22 12:42:41 -05:00
Nate Jensen
e65d392677 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 938e4a3073 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]
Former-commit-id: 5e2ebbaad8
2013-10-22 12:42:41 -05:00
Nate Jensen
5076c2e024 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 938e4a3073 [formerly e65d392677 [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]
Former-commit-id: e65d392677 [formerly 5e2ebbaad8]
Former-commit-id: e65d392677
Former-commit-id: 4879e1d7d3
2013-10-22 12:42:41 -05:00
Nate Jensen
d265f4ddf4 Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: 3f93aeeb8259600b1c6e0ff47641ff95337df605
2013-10-15 14:23:59 -05:00
Nate Jensen
3f107e931f Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: d265f4ddf4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]
Former-commit-id: 323f594de4
2013-10-15 14:23:59 -05:00
Nate Jensen
03109dae41 Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: d265f4ddf4 [formerly 3f107e931f [formerly 323f594de4] [formerly d265f4ddf4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]
Former-commit-id: 3f107e931f [formerly 323f594de4]
Former-commit-id: 3f107e931f
Former-commit-id: 0d7d2257cc
2013-10-15 14:23:59 -05:00
Max Schenkelberg
2d1db7d0e2 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: efb402d2835f715143cddffeec2bd7c20d0a65f6
2013-09-09 10:10:11 -05:00
Max Schenkelberg
8a500677d3 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]
Former-commit-id: b633f9987a
2013-09-09 10:10:11 -05:00
Max Schenkelberg
ff28590621 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 2d1db7d0e2 [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]
Former-commit-id: 8a500677d3 [formerly b633f9987a]
Former-commit-id: 8a500677d3
Former-commit-id: 3509baaa74
2013-09-09 10:10:11 -05:00
Jonathan Sanchez
de24b8b431 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: 55cb110ba6f328d9fb68d3a9c46254f342299237
2013-07-02 11:04:26 -05:00
Jonathan Sanchez
58fcc4c896 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]
Former-commit-id: a2328f0e06
2013-07-02 11:04:26 -05:00
Jonathan Sanchez
3d71cf1c67 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: de24b8b431 [formerly 58fcc4c896 [formerly a2328f0e06] [formerly de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: 58fcc4c896 [formerly a2328f0e06]
Former-commit-id: 58fcc4c896
Former-commit-id: bbd2a9e5ab
2013-07-02 11:04:26 -05:00