Commit graph

391 commits

Author SHA1 Message Date
Steve Harris
1d2ad9224a Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
2012-05-09 13:14:00 -05:00
Nate Jensen
7ca2d0ddce Issue #440 add listeners before connecting and fix populateGroups()
Change-Id: Ief028f153954484666d01f52b91da9c97490ef94

Former-commit-id: 4152290029 [formerly f59d388be1] [formerly 4152290029 [formerly f59d388be1] [formerly cb3527bca8 [formerly ea146f69c6fca818589587d37aace2afc75e7147]]]
Former-commit-id: cb3527bca8
Former-commit-id: a5806f837b [formerly 41ec3f0606]
Former-commit-id: 59e53aeec2
2012-05-08 17:55:22 -05:00
Matt Nash
c498777a09 Issue #440 fix spooky mistake of plugin customization file
Former-commit-id: e2388a1cdb [formerly 32552c7aca] [formerly e2388a1cdb [formerly 32552c7aca] [formerly a32f40ce0a [formerly 24f52653518c0f0430ba13aea98b6b6d6ef1f494]]]
Former-commit-id: a32f40ce0a
Former-commit-id: 198ab99bb2 [formerly 24d60a6d2e]
Former-commit-id: 28a75a17cc
2012-05-08 16:11:43 -05:00
Nate Jensen
75b33212f8 Issue #440 fix duplicate groups
Change-Id: I3bed636fa06de47d3dbdceb210284e624b626dae

Former-commit-id: f4be87da62 [formerly 5b0f431131] [formerly f4be87da62 [formerly 5b0f431131] [formerly 51971ac305 [formerly cbc0b8ba9936c6cad874e22e24fe38acb7855a3f]]]
Former-commit-id: 51971ac305
Former-commit-id: cda9247d09 [formerly 4a1d2d906e]
Former-commit-id: ecca734ba7
2012-05-08 15:55:06 -05:00
Nate Jensen
dd08e8b239 Issue #440 fix errors
Change-Id: Ic4d3235727136d38a410f6e0452674aaaf9fab3b

Former-commit-id: 880604feed [formerly ccccaf2d28] [formerly 880604feed [formerly ccccaf2d28] [formerly 6c057c9d7a [formerly dcbaf62a1edc168f0414078dc61323b7db32c9ee]]]
Former-commit-id: 6c057c9d7a
Former-commit-id: a7fb88f5bf [formerly 13d56f04f0]
Former-commit-id: 7a5d0d7b53
2012-05-08 14:37:24 -05:00
Matt Nash
4385bf7334 Issue #440 remove duplicate roster/presence classes
Former-commit-id: 8ab1597db7 [formerly 01dc5ddbb3] [formerly 8ab1597db7 [formerly 01dc5ddbb3] [formerly f91d457e5d [formerly cc3031e4d2142f79d935e441ed0bed9824b54251]]]
Former-commit-id: f91d457e5d
Former-commit-id: b06f5e43dd [formerly 76e037485f]
Former-commit-id: a5caa90acf
2012-05-08 12:57:12 -05:00
Matt Nash
69a4b3ea5a Issue #440 Login dialog off the UI thread
Former-commit-id: ca4c0788f1 [formerly 1b12a27631] [formerly ca4c0788f1 [formerly 1b12a27631] [formerly 3f53ab4a89 [formerly d37f9b0ee38028c3995ed76ef69385ee3b4a152f]]]
Former-commit-id: 3f53ab4a89
Former-commit-id: 61b1fe7314 [formerly 408263e5a7]
Former-commit-id: b9b4f9681c
2012-05-08 10:58:16 -05:00
Max Schenkelberg
558cb37f97 Issue #587 Fixed colorbar border flicker, made area have aspect ratio of data provider
Change-Id: If3a768ee5b61af7459ff8d22beab3270111f5286

Former-commit-id: 7814fca6e9 [formerly af162bedf5] [formerly 7814fca6e9 [formerly af162bedf5] [formerly 3d15400eb7 [formerly 14107837a06d36b75d2b4878a0c72a650c4b2579]]]
Former-commit-id: 3d15400eb7
Former-commit-id: abb74d20fe [formerly 846ae30be9]
Former-commit-id: d57034bbff
2012-05-03 15:54:22 -05:00
Max Schenkelberg
42c569430b Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103

Former-commit-id: 0f6240eaea [formerly d4c10e5548] [formerly 0f6240eaea [formerly d4c10e5548] [formerly c81c225a6e [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]
Former-commit-id: c81c225a6e
Former-commit-id: 726c543266 [formerly c6edfad263]
Former-commit-id: 1189dba8a7
2012-05-03 13:07:43 -05:00
Max Schenkelberg
78925afe73 Issue #584 Got draw point calls working
Change-Id: I80f9061647a96e66acf70fb5c22aefb8916979b0

Former-commit-id: eb948b3dc1 [formerly 65f8b18194] [formerly eb948b3dc1 [formerly 65f8b18194] [formerly 5d9da5e1ef [formerly 39a9ae5047e2f873d9b09ba65eded740f6568cec]]]
Former-commit-id: 5d9da5e1ef
Former-commit-id: 06871710c3 [formerly 01ae8134b2]
Former-commit-id: a3baaa9ae8
2012-05-02 16:40:55 -05:00
Matt Nash
6f5a90b259 Issue #429 add capability for session leader to change other's colors
Former-commit-id: dee26f4fd5 [formerly 817bd297c8] [formerly dee26f4fd5 [formerly 817bd297c8] [formerly c746441432 [formerly 6cdc4cfa9e740988c01a73ec862fcaed72403b45]]]
Former-commit-id: c746441432
Former-commit-id: f62991f7b2 [formerly df25bbf079]
Former-commit-id: 5aecb3340e
2012-05-02 14:36:58 -05:00
Matt Nash
9100e0e372 Issue #437 fix change status, remove double posting
Former-commit-id: 8bb1342bfb [formerly e9f75e7f50] [formerly 8bb1342bfb [formerly e9f75e7f50] [formerly 3c8143e8bc [formerly 038bae22b932a1bdddeca4dd813920bf62b8db71]]]
Former-commit-id: 3c8143e8bc
Former-commit-id: bdd71c5347 [formerly 1e4d656cf9]
Former-commit-id: 2da26e7ed5
2012-05-02 14:36:58 -05:00
Max Schenkelberg
e9e4327ec9 Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01

Former-commit-id: 3ffb18b767 [formerly a045f6f3b9] [formerly 3ffb18b767 [formerly a045f6f3b9] [formerly b82eb49055 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]
Former-commit-id: b82eb49055
Former-commit-id: 887177aa84 [formerly 6a1b035c2d]
Former-commit-id: f4bd13133e
2012-05-02 10:20:20 -05:00
Matt Nash
75ace5ee68 Issue #448 use aliased name in peer to peer if available, fixes the extra view that once was created
Former-commit-id: e1213ccea9 [formerly 167767dcbc] [formerly e1213ccea9 [formerly 167767dcbc] [formerly d1f23b8dee [formerly 37181c07d14af1ab3cacd363d9ce150771139d3b]]]
Former-commit-id: d1f23b8dee
Former-commit-id: 3dbdc7246f [formerly b0beab3044]
Former-commit-id: 49fa359d9a
2012-05-02 09:42:50 -05:00
Max Schenkelberg
6340cddacc Issue #239 Fixed url path issue for joining late
Change-Id: Ibf11c6d12b93954aad6e3969fa9869e977d48de6

Former-commit-id: 69cb2ff5ee [formerly adabe413f6] [formerly 69cb2ff5ee [formerly adabe413f6] [formerly 0326936e85 [formerly 9879fcd8733798a96026b3459d66f5f9e757e182]]]
Former-commit-id: 0326936e85
Former-commit-id: edf13162a6 [formerly a608dcb59b]
Former-commit-id: 11cf1f3a23
2012-05-02 09:25:44 -05:00
Max Schenkelberg
4ddcccc3c7 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 2ef208b263 [formerly 3fe183277b] [formerly 2ef208b263 [formerly 3fe183277b] [formerly e3d6962fe6 [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: 338f80fa87 [formerly 878de45ee6]
Former-commit-id: 9f72069996
2012-05-01 18:36:09 -05:00
Steve Harris
491aa53a0c Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: 4ec294b525 [formerly 2ed7249613] [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131 [formerly 6dd3ee8809]
Former-commit-id: fd9e226b35
2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510 12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Nate Jensen
069394a973 Issue #427 cleanup
Change-Id: Ide2e5c8f5c2e8ced3bdf47d090619789c265f691

Former-commit-id: 8bed608bc5 [formerly 9a992aab78] [formerly 8bed608bc5 [formerly 9a992aab78] [formerly 0b6b92c9ff [formerly 2165fb7d4b1e2743110f647797b8f6017fc0a86c]]]
Former-commit-id: 0b6b92c9ff
Former-commit-id: 8c88416642 [formerly e89143161c]
Former-commit-id: 6bcab11947
2012-05-01 17:33:55 -05:00
Matt Nash
fcb1eac45b Issue #448 clean up group code
Former-commit-id: 9ca693dd1e [formerly ae7b40634e] [formerly 9ca693dd1e [formerly ae7b40634e] [formerly 8791b7329a [formerly aad6d7178694bfe9b42171729b4185e65429a515]]]
Former-commit-id: 8791b7329a
Former-commit-id: e2260c94a7 [formerly 5d3c2686cd]
Former-commit-id: f99b59b0fd
2012-05-01 16:14:33 -05:00
Max Schenkelberg
59ffa4cbed Issue #239 Got joining late working to load data participants don't have
Change-Id: I7c27e584b3b7f7331708689acee7f1b62fefe0eb

Former-commit-id: c72650baef [formerly edacf7a4b3] [formerly c72650baef [formerly edacf7a4b3] [formerly 4b8f81dbcb [formerly ceabfd385103380f99bed2eaa4470cfbcb70cef9]]]
Former-commit-id: 4b8f81dbcb
Former-commit-id: 55ecffce8b [formerly 0b5623654a]
Former-commit-id: 37077c6b3e
2012-05-01 15:51:15 -05:00
Matt Nash
d9787cab1c Issue #448 fix icons
Former-commit-id: 7b96d1e9bc [formerly fd515ad766] [formerly 7b96d1e9bc [formerly fd515ad766] [formerly 9764210b93 [formerly 6b6ef0c250f895f20e43a5b596be7189d8bc9d5f]]]
Former-commit-id: 9764210b93
Former-commit-id: cd36f4cd8a [formerly 529444c746]
Former-commit-id: a55f4c6402
2012-05-01 15:07:46 -05:00
Matt Nash
0b42e393c9 Issue #448 problem where the file is not there and null is returned
Former-commit-id: 27ea55dad3 [formerly cef6bd81a8] [formerly 27ea55dad3 [formerly cef6bd81a8] [formerly 1872503cd8 [formerly 41eb0413a8c68104532d4f302c4bed07a572b430]]]
Former-commit-id: 1872503cd8
Former-commit-id: 72a6207eb7 [formerly 7a89fa8342]
Former-commit-id: e39edb5776
2012-05-01 11:55:12 -05:00
Matt Nash
2b31a87bc2 Issue #448 aliasing works on tabs and such now too
Former-commit-id: 8a0f32b639 [formerly 88b20d568e] [formerly 8a0f32b639 [formerly 88b20d568e] [formerly 4a0b1e36ca [formerly 9dca1c46abc1d6eb4f81066c14a4b888f3c37b46]]]
Former-commit-id: 4a0b1e36ca
Former-commit-id: b7a2b627f6 [formerly f121499f7a]
Former-commit-id: a601af019e
2012-05-01 10:28:20 -05:00
Matt Nash
f9848ce8bf Issue #448 further aliasing
Former-commit-id: 9c6768f254 [formerly 603b114ae7] [formerly 9c6768f254 [formerly 603b114ae7] [formerly efd6485647 [formerly 066671debfaf52427cc0584513edd11f6cf10689]]]
Former-commit-id: efd6485647
Former-commit-id: 77e0495f50 [formerly b797bf94b9]
Former-commit-id: 7ce6186e51
2012-04-30 17:28:01 -05:00
Matt Nash
d843a72dd6 Issue #448 aliasing for group view
Former-commit-id: 8ae54b2e0c [formerly cb6aa40f42] [formerly 8ae54b2e0c [formerly cb6aa40f42] [formerly 49bda84329 [formerly aa42c1600b675412a5ee73a7e2da48602f05e10f]]]
Former-commit-id: 49bda84329
Former-commit-id: f7f9e9fee7 [formerly 77e3b905b0]
Former-commit-id: 278729c19d
2012-04-30 16:45:35 -05:00
Nate Jensen
9952659521 Issue #427 cleanup
Change-Id: I878ec6ab2f3635ba861e4cc2db7716c0a51ba9b1

Former-commit-id: c958d3a471 [formerly 6a034283b5] [formerly c958d3a471 [formerly 6a034283b5] [formerly eac55b7587 [formerly 4c8192e99f1ecb57bc6a4efeaa6d7ee3a8127ec1]]]
Former-commit-id: eac55b7587
Former-commit-id: d91295cf0a [formerly fafdf1de48]
Former-commit-id: 226437c8a0
2012-04-30 15:49:44 -05:00
Nate Jensen
97d6aa8701 Issue #427 remove extraneous event buses
Change-Id: I958de58ba963609ada80529195d024077a901a0e

Former-commit-id: 56ae7eab86 [formerly 7aa1e562d8] [formerly 56ae7eab86 [formerly 7aa1e562d8] [formerly bfd45d703f [formerly 1c0d5457c079880996fc75872870545ededb4316]]]
Former-commit-id: bfd45d703f
Former-commit-id: 85067c02b7 [formerly 9f32676a86]
Former-commit-id: a844d4f24d
2012-04-30 15:33:59 -05:00
Max Schenkelberg
e95bc35d1a Issue #239 Made custom PointImageExtension that handles differencing for faster plot rendering
Change-Id: I2e22ee3eb6fe67ff754dd4689b8c8876eb3b893d

Former-commit-id: 5e5e362f39 [formerly 9e2cf73f7a] [formerly 5e5e362f39 [formerly 9e2cf73f7a] [formerly 60aac07962 [formerly 2caf3e8ebb70ffd455cb9f354b1226e858898822]]]
Former-commit-id: 60aac07962
Former-commit-id: b060788489 [formerly 7bfaa9474b]
Former-commit-id: 37d9d12838
2012-04-30 15:01:37 -05:00
Bryan Kowal
354eda8407 Issue #517 - ensure that plugin.xml is packaged in the com.raytheon.uf.viz.collaboration.radar jar file.
Former-commit-id: ed83cb8a52 [formerly ed878bc13d] [formerly ed83cb8a52 [formerly ed878bc13d] [formerly 84e3c4704e [formerly 22fb97b29a3e7fd310de9915b83ffcbd2c7771a0]]]
Former-commit-id: 84e3c4704e
Former-commit-id: b75ff37fd3 [formerly a2d1cc317d]
Former-commit-id: 4fcc1870b4
2012-04-30 12:45:30 -05:00
Nate Jensen
946adcfb0c Issue #427 remove dead code
Change-Id: I36e3f77f8c0176b72762abc311d8e4e3eab22e0e

Former-commit-id: 6de861e9b5 [formerly d5a3acc97b] [formerly 6de861e9b5 [formerly d5a3acc97b] [formerly bba6d5e400 [formerly 90a1888baffbb21ac3b2f555764c37a519d5efb1]]]
Former-commit-id: bba6d5e400
Former-commit-id: 844946764c [formerly 2e02578b63]
Former-commit-id: a20cf866e5
2012-04-27 16:22:27 -05:00
Nate Jensen
829c6621e9 Issue #427 separated collaboration.ui into two plugins
Change-Id: I3085f2aae4c1c44b65749e587a9eb753d1d7a34b

Former-commit-id: d952fe084a [formerly e8f1c0159c] [formerly d952fe084a [formerly e8f1c0159c] [formerly 9454cbd1b9 [formerly f96302b439b39030e54a2b87a6e2387ebb63502f]]]
Former-commit-id: 9454cbd1b9
Former-commit-id: 99e561a26e [formerly 4a85e47ee9]
Former-commit-id: 03db8baf70
2012-04-27 16:12:48 -05:00
Nate Jensen
79c99ecfe5 Issue #427 better part listeners
Change-Id: I0787fdc7a086c87228e9f38ce85e23dd9edc4bd2

Former-commit-id: cafa23c9d2 [formerly 855ec5dd4d] [formerly cafa23c9d2 [formerly 855ec5dd4d] [formerly 866acb24b2 [formerly 008164a55b5720eaf8dbfd2d023fefc9ab705936]]]
Former-commit-id: 866acb24b2
Former-commit-id: 19dfa62f58 [formerly cc61a7a62f]
Former-commit-id: e4afe7405c
2012-04-27 14:47:27 -05:00
Matt Nash
203dae601a Issue #448 add preference page for collaboration, currently only enabling and disabling notifications
Former-commit-id: 0a3a7bfba2 [formerly cc313ebcac] [formerly 0a3a7bfba2 [formerly cc313ebcac] [formerly 00d11cdeaa [formerly 1a0bc57f249f3b757c6226526ba05b2f8d1ab2e6]]]
Former-commit-id: 00d11cdeaa
Former-commit-id: aea9b34499 [formerly af819b2e0d]
Former-commit-id: 1e75e1b24d
2012-04-27 14:34:55 -05:00
Max Schenkelberg
e98537b537 Issue #239 Added render frame merging capability
Change-Id: Ie16e650693de6e07453357740b3c2bae21bd999d

Former-commit-id: 4175affdc7 [formerly ff0827b51d] [formerly 4175affdc7 [formerly ff0827b51d] [formerly df07bff0bc [formerly ad6d31300e0ac41375a3eb65ce337a6105be72ee]]]
Former-commit-id: df07bff0bc
Former-commit-id: c0a47ede0d [formerly e5e13fc3b3]
Former-commit-id: 8a4f34223e
2012-04-27 11:57:53 -05:00
Matt Nash
249b72e35d Issue #429 add better notification to chat
Former-commit-id: 590862b77d [formerly e0d11ae8b1] [formerly 590862b77d [formerly e0d11ae8b1] [formerly 3b2fdaa579 [formerly 40db7caa4b6bd45537f4cb37a3f034a907cd8f79]]]
Former-commit-id: 3b2fdaa579
Former-commit-id: e94eaf4752 [formerly 91035ee253]
Former-commit-id: c930a63797
2012-04-27 10:10:05 -05:00
Matt Nash
de1fe44cfc Issue #429 make chatting append to message before sending out to prevent delay, add notification method so if CAVE is minimized the user will still get the notification that a new chat has happened
Former-commit-id: c1983d295d [formerly 25201fcbad] [formerly c1983d295d [formerly 25201fcbad] [formerly 16de1dbafe [formerly 9c0f7ee82b7a844620f1f2e00947a256582b86ef]]]
Former-commit-id: 16de1dbafe
Former-commit-id: 051b9397f7 [formerly 501b74478e]
Former-commit-id: 32772c5ecc
2012-04-27 10:08:27 -05:00
Matt Nash
609c0a8ecb Issue #448 remove listener to help prevent exceptions
Former-commit-id: 331adad3a3 [formerly 29b39a1df4] [formerly 331adad3a3 [formerly 29b39a1df4] [formerly b69e13d795 [formerly 66ac99ff89a3347d528d09081d41c248f4ff4783]]]
Former-commit-id: b69e13d795
Former-commit-id: 8e4072b67d [formerly fcecab2afb]
Former-commit-id: 20b7f4c34b
2012-04-26 09:17:27 -05:00
Max Schenkelberg
cd7fe895bc Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: 2cc5794428 [formerly a912786429] [formerly 2cc5794428 [formerly a912786429] [formerly f74b6b4a93 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 7bb4057d32 [formerly 2d25e8bb78]
Former-commit-id: 936fa688c0
2012-04-25 17:28:52 -05:00
Nate Jensen
e4cf062156 Issue #427 remove sysouts
Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db

Former-commit-id: 1ff944fc2d [formerly ed4303158c] [formerly 1ff944fc2d [formerly ed4303158c] [formerly e17dad1b54 [formerly 5b87a033a88899b1ca033b18efc9532002b047c0]]]
Former-commit-id: e17dad1b54
Former-commit-id: 066638a057 [formerly 0c523369c4]
Former-commit-id: 4eb455b7b1
2012-04-25 16:56:19 -05:00
Max Schenkelberg
3a5cdaa69a Got efficient sending of events working where it only sends if events changed
Change-Id: I499a38c1b9cbbd3ede5b04356d2f7788153f836b

Former-commit-id: d77732bd7d [formerly 84b8ffa490] [formerly d77732bd7d [formerly 84b8ffa490] [formerly 28693e6991 [formerly 2f1f6dd97555c46547a7440c97a5314f7a26dc8d]]]
Former-commit-id: 28693e6991
Former-commit-id: 51d7591203 [formerly e608125f9d]
Former-commit-id: 0ba535a60b
2012-04-25 16:18:41 -05:00
Matt Nash
f73d40874d Issue #448 slight changes to data provider and session leader indicators
Former-commit-id: 12426aba3b [formerly 06d71f13ad] [formerly 12426aba3b [formerly 06d71f13ad] [formerly 8f93192385 [formerly 61bcce04de9bf4e4756140903ed3dd861333fd2b]]]
Former-commit-id: 8f93192385
Former-commit-id: a342e09abc [formerly f212b1d1ae]
Former-commit-id: 9d0fd819ff
2012-04-25 15:07:14 -05:00
Nate Jensen
7da55177b0 Issue #427 renamed data provider rsc
Change-Id: I05b417c3f7d65908a52910f9d847cc188c7c4a9c

Former-commit-id: e816529d71 [formerly 069f809596] [formerly e816529d71 [formerly 069f809596] [formerly b3723bc986 [formerly 35ef9c2c228ac97ef623edd1e50800495d9ab8f7]]]
Former-commit-id: b3723bc986
Former-commit-id: a91f47146b [formerly a14bccc7ac]
Former-commit-id: 9c7af0cfeb
2012-04-25 14:41:37 -05:00
Matt Nash
d59b3ce770 Issue #448 first pass at alias
Former-commit-id: b480ccd3fe [formerly 7d870434f6] [formerly b480ccd3fe [formerly 7d870434f6] [formerly b20b9530fd [formerly 34f230b550a886cad03e3ffeeeaeeaebe480defc]]]
Former-commit-id: b20b9530fd
Former-commit-id: e6bd4420ab [formerly f3467023a2]
Former-commit-id: 23c3615fd6
2012-04-25 14:25:52 -05:00
Matt Nash
d284b5d89a Issue #429 color final fixes
Former-commit-id: 03174d8f66 [formerly 9bc3f0c75d] [formerly 03174d8f66 [formerly 9bc3f0c75d] [formerly 506d3e8989 [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]]
Former-commit-id: 506d3e8989
Former-commit-id: 4ff28dd769 [formerly 76e8b2e192]
Former-commit-id: d51f16cd6c
2012-04-25 14:22:12 -05:00
Max Schenkelberg
6915230cdf #Issue 239 Got bulk event sending and only sending events when previous frame changes.
Former-commit-id: 4c3afb8f7c [formerly 001c52bd3a] [formerly 4c3afb8f7c [formerly 001c52bd3a] [formerly 9607d3dd41 [formerly 4ac2f1ac53970f57936d3b8cd5dfcd90f718c6ce]]]
Former-commit-id: 9607d3dd41
Former-commit-id: cb4c445a05 [formerly 9d8dbba20b]
Former-commit-id: bf92452419
2012-04-25 11:27:19 -05:00
Matt Nash
64cab6c5f9 Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: abbe0c3d6b [formerly d84865ced9] [formerly abbe0c3d6b [formerly d84865ced9] [formerly 09fc05162c [formerly 46a327c929a09c21270f7b6de543e8d742476003]]]
Former-commit-id: 09fc05162c
Former-commit-id: 5fa80650b3 [formerly 563e76c313]
Former-commit-id: 8739f702d0
2012-04-25 07:39:05 -05:00
Matt Nash
1659ccaed5 Issue #429 colors for collaboration session
Former-commit-id: 190a951b26 [formerly 63dccd6b85] [formerly 190a951b26 [formerly 63dccd6b85] [formerly bc1e35f4b4 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]]
Former-commit-id: bc1e35f4b4
Former-commit-id: 75a76124f8 [formerly d79ae59e19]
Former-commit-id: f614a5bb04
2012-04-24 16:39:28 -05:00
Nate Jensen
95c3235746 Issue #427 minor fix
Change-Id: I341e046bcde321ae70a2afeb745bedb0078758ca

Former-commit-id: 652c2a5411 [formerly fd1f337a92] [formerly 652c2a5411 [formerly fd1f337a92] [formerly bcc435ac28 [formerly 2d544b5c2fb48870173ea9d38b4c7370f6ebe49f]]]
Former-commit-id: bcc435ac28
Former-commit-id: aec56b4df0 [formerly 7c727f5a0e]
Former-commit-id: a867e1ab82
2012-04-24 15:28:36 -05:00
Nate Jensen
d50983a4fe Issue #427 login data stored in preferences
Change-Id: I0ac9d34f6a7eaf8f6db80d6c573115bd43e2e11c

Former-commit-id: a2a6d2d61d [formerly c4afe61f01] [formerly a2a6d2d61d [formerly c4afe61f01] [formerly bf3eb689cc [formerly 287dae35ae3566f22a2d9e5a22760f3ef9d29ca2]]]
Former-commit-id: bf3eb689cc
Former-commit-id: 4d81850de4 [formerly 0a7a5d44ff]
Former-commit-id: 23bd871123
2012-04-24 14:11:27 -05:00