Commit graph

2544 commits

Author SHA1 Message Date
Matt Nash
bf1a187e49 Issue #244 added work on the chat for presence notifications
Former-commit-id: b8cb02de4c [formerly c96c33169b] [formerly d264743199] [formerly 6f354374d6 [formerly d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: 855d12bbe7f26f52a1fcdfe7ec7faffbaff0c8fb [formerly 4f35191a6b]
Former-commit-id: b4a5aaea11
2012-03-08 09:08:41 -06:00
Matt Nash
0ef60a57f3 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: b73877e9a5 [formerly 1e4472cd78] [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: b87a5a6e0ba1906d19de0e9c7ce07edc116f66e4 [formerly 7efd993e18]
Former-commit-id: dd57ff6b7f
2012-03-08 08:33:32 -06:00
Roger Ferrel
ab81628692 Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: b1a69aafff [formerly c22d5ef573] [formerly 4f4025ea23a0b60e1f1736431d8cdc6028c67caf [formerly c9459e2e8c]] [formerly 2114b95a0b [formerly c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 9c709d5af9cfb0e1e37a724c243c0fbbb12057a5 [formerly 1a2608a2fa]
Former-commit-id: 40b910c05e
2012-03-08 08:30:02 -06:00
James Korman
7a91f24e27 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 373f5b4060 [formerly 4368616970] [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: 30ad0a0f992968ee55254e2e103edff30614f710 [formerly 2fea86a591]
Former-commit-id: f242c1a430
2012-03-07 15:38:20 -06:00
Nate Jensen
1747d01347 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: a448a80004 [formerly 13228ab7cc] [formerly f950b30463] [formerly 412ceb9561 [formerly f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 412ceb9561
Former-commit-id: 9ce5eb6c5b02138237e3f9860e90c4d32e19f1ee [formerly d0672cf2b6]
Former-commit-id: 39f89588a1
2012-03-06 14:27:15 -06:00
Roger Ferrel
f406bca886 Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 3161380f4d [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: 3161380f4d
Former-commit-id: c93492e46d7634f4442b5821cc164ccf698b4647 [formerly ccfadae952]
Former-commit-id: 0cf600a16c
2012-03-06 14:08:39 -06:00
David Gillingham
e0987cc993 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]
Former-commit-id: 29f03b0d2a
2012-03-05 11:23:11 -06:00
David Gillingham
f670f3c950 Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]
Former-commit-id: bce9ad39ae
2012-03-02 13:22:46 -06:00
Max Schenkelberg
52c7dec2e8 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]
Former-commit-id: 0554abdde0
2012-03-01 16:59:40 -06:00
Steve Harris
6fdae68267 Merge branch 'ss_sync' into sync_test
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]
Former-commit-id: b3f831a7b4
2012-03-01 14:01:16 -06:00
Steve Harris
13597e2d3d Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0]
Former-commit-id: fe0b1eed94
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
6ec01d1d19 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]
Former-commit-id: f8c2ad7136
2012-03-01 12:44:43 -06:00
Steve Harris
f5db44b7aa Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]
Former-commit-id: 3e4d618486
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
cc8e7897cf Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]
Former-commit-id: 390700efb0
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
1ac84dc230 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]
Former-commit-id: dba810ddc4
2012-02-28 15:20:37 -06:00
Steve Harris
2dbdc945bf Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]
Former-commit-id: 73a337bc31
2012-02-27 15:58:49 -06:00
Steve Harris
b65a901af6 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a]
Former-commit-id: 7c18ec7c7c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
d5118790dd Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac]
Former-commit-id: 88d2d2e4b6
2012-02-24 14:57:23 -06:00
David Gillingham
d10c91b814 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]
Former-commit-id: 6bca8d6353
2012-02-23 14:40:25 -06:00
David Gillingham
d9def42052 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]
Former-commit-id: 9ff631305a
2012-02-23 13:23:59 -06:00
Steve Harris
fbb5de922a Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]
Former-commit-id: 4eb1ef5b0f
2012-02-23 12:38:55 -06:00
Steve Harris
d1589bf5e5 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2]
Former-commit-id: 43b83ed8aa
2012-02-23 10:19:54 -06:00
Steve Harris
2d02f819be Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]
Former-commit-id: 92b7072b82
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
e99e823ca8 Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7]
Former-commit-id: c3d3142bab
2012-02-22 17:40:48 -06:00
Steve Harris
13a3edd4f6 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
2012-02-22 11:14:43 -06:00
Steve Harris
139d42c594 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
2012-02-22 10:12:49 -06:00
Steve Harris
0295f24df1 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aee8ef48fe [formerly 2c12c02910] [formerly 39d576f84fe54a129e1631ac7c208e0d49e5fd36 [formerly 84926c80be]] [formerly f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: f0db7f39e4b09a4a991fc462354c2e91299cc7e0 [formerly 6d1b04e62c]
Former-commit-id: 968239217e
2012-02-21 10:37:36 -06:00
Nate Jensen
8dc1ff026f Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 7bcacb16073573ba01393828f50c6e24f05ad1a2 [formerly 13ea11ddfc]
Former-commit-id: 2ee4305d77
2012-02-21 08:57:12 -06:00
Steve Harris
3371e158a6 Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
	.gitignore
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
	deltaScripts/.pydevproject
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java

Former-commit-id: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]
Former-commit-id: dd3a5a8d88
2012-02-20 16:38:06 -06:00
Ben Steffensmeier
ab464fde3e Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 1c1500408b [formerly 27973ec694] [formerly 69e8cde115] [formerly 73d24fad2f [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 2e661e9d7cba71c6da9333bda034d1523204696a [formerly dcbe4fc7da]
Former-commit-id: 0ee68fb6cc
2012-02-20 15:28:20 -06:00
Steve Harris
2e0f1d3ecc Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]
Former-commit-id: b12f5e5d75
2012-02-20 13:03:39 -06:00
Steve Harris
4ffbe4780e Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]
Former-commit-id: b41e5f2415
2012-02-20 12:54:25 -06:00
Steve Harris
c9a7ff42f4 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]
Former-commit-id: dd911bed4d
2012-02-20 12:43:38 -06:00
Steve Harris
07f2cb3a81 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly c825bd03a2 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]
Former-commit-id: c825bd03a2
Former-commit-id: 84a9ca92db5e27c27139e506edd8d80314f58cf7 [formerly 0fab56e0f1]
Former-commit-id: b609a6fd60
2012-02-20 07:49:13 -06:00
Steve Harris
43c3cfdd1a Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]
Former-commit-id: 1ac6b36d1f
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
44cf04ab3c Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: be6c430985 [formerly 38993f5a5a] [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: 352ec371eefbdee61fc6971ec28eadecfb26a5b4 [formerly d4e7df98a9]
Former-commit-id: ea93dcd939
2012-02-16 16:36:56 -06:00
Steve Harris
1355f55290 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: dc6e74757a [formerly c26a22cfb7] [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly e2989d1a9f [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]]
Former-commit-id: 64ddef69b6
Former-commit-id: 2f9c0de46ffed17da8fa4729621963717c0e2d99 [formerly ff45f4eaab]
Former-commit-id: 840c858697
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
e55c51da39 Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee

Former-commit-id: 7abc89a7d0 [formerly 0104e1970d] [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly 28c7e6bc22 [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]]
Former-commit-id: 8cf7360e3b
Former-commit-id: 47e1a23d52597de86c39cbd5e06efa8089017300 [formerly b819bfa8e9]
Former-commit-id: 7de650c868
2012-02-15 17:10:34 -06:00
Steve Harris
1d529a0d83 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: 1e32c15008441ec81c586e6dfaf0f8d5acded476 [formerly cb3371ee28]
Former-commit-id: d23d12d596
2012-02-14 15:54:46 -06:00
David Gillingham
9a17298fb6 Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue #20: Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]
Former-commit-id: 061966f243
Former-commit-id: 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa]
Former-commit-id: 3e42bc7d2d
2012-02-13 16:09:36 -06:00
Nate Jensen
fd5eb06abf Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: b95dd7bc43 [formerly 364cd8f5fc] [formerly da7d13d933] [formerly 06327646d9 [formerly da7d13d933 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]]
Former-commit-id: 06327646d9
Former-commit-id: bc709c1847d2b067f7c218676ccb865beb2e58fe [formerly dd8500b081]
Former-commit-id: ce7e58062c
2012-02-13 11:40:36 -06:00
Bryan Kowal
026a95809f Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 2f80fdcd73 [formerly 8e552ca56f] [formerly 34d9122f14] [formerly c77b9558e1 [formerly 34d9122f14 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]]
Former-commit-id: c77b9558e1
Former-commit-id: 37e04f0a16c9fe0335037849dade6792c4d8246c [formerly 2c3f67d470]
Former-commit-id: ef4218bdb0
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
59d62510ea Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

Former-commit-id: ced66f23a5 [formerly 6e95175ba2] [formerly ebbbd0bafc] [formerly f7985bff7b [formerly ebbbd0bafc [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]
Former-commit-id: f7985bff7b
Former-commit-id: d92b9c3f75bd9c764113a021ca2bf3440df9c8f6 [formerly a9e13fac26]
Former-commit-id: 99557a2a0f
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
34c03d78d0 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 8a5a87c2b1 [formerly 08e8343d98] [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 5cdcd5a261 [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: b17c805c928548abe79f8ce56d670d4b8f032bbf [formerly 512e0f1bd5]
Former-commit-id: 9d442083a1
2012-02-09 10:54:02 -06:00
Steve Harris
5ee70f0f28 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 60b350f7f2 [formerly 695e2979c3] [formerly 1002555dbd] [formerly f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958]
Former-commit-id: 93e856457b
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
7dd3206882 Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9

Former-commit-id: d9a3c84933 [formerly ddd5ee68ad] [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly 863fa0f635 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]]
Former-commit-id: 3f60daa9c7
Former-commit-id: e3debd0d8974eb97e4ab13e3a2137a497123f416 [formerly d49939ddb2]
Former-commit-id: b09c00244e
2012-02-08 16:29:02 -06:00
Matt Nash
fe7b452edc Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: 6a2add04e9 [formerly ce5baf0632] [formerly e52a1315b2] [formerly 25b9659dc7 [formerly e52a1315b2 [formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]]
Former-commit-id: 25b9659dc7
Former-commit-id: 5aedddcb83f5d2dcb152e6e8b57fdc56eb5ced23 [formerly 5c10b1d587]
Former-commit-id: 6e11115195
2012-02-08 08:53:19 -06:00
Matt Nash
149e9783f1 Issue #26 fix gage color for hydro to refresh
Former-commit-id: 09b640cd98 [formerly c4fee978d7] [formerly f7652d25e3] [formerly bb4f690393 [formerly f7652d25e3 [formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]]
Former-commit-id: bb4f690393
Former-commit-id: a08c39aff0edeedbc66e80b72f3a1b1d55e64a7a [formerly 82089434e5]
Former-commit-id: d3433544ab
2012-02-07 16:49:34 -06:00
Max Schenkelberg
129bd62196 Issue #206 fixed dialog context deactivation bug
Former-commit-id: 3560698faf [formerly d5369932fd] [formerly 9535ae2d0e] [formerly fe59c3e8d8 [formerly 9535ae2d0e [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 56ccf4761ab72766f6229a41f02810af4159766e [formerly 9a7efcaae8]
Former-commit-id: 0c4a9cf58a
2012-02-07 16:45:59 -06:00
Matt Nash
3fb20bbcfd Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
Former-commit-id: ea51f1e358 [formerly 6fc771908f] [formerly 81ec1d5dac] [formerly be92a03f2d [formerly 81ec1d5dac [formerly 65ce29e9b3721e7eef2a9ec842404252ead2d3ba]]]
Former-commit-id: be92a03f2d
Former-commit-id: a75e921a161832dd09fc4d8552a7a8dc258be7b2 [formerly e629c0bc38]
Former-commit-id: 178663bd09
2012-02-07 16:13:03 -06:00