Commit graph

843 commits

Author SHA1 Message Date
Max Schenkelberg
9f34d7a5f3 Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: 2d36eb040d [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]
Former-commit-id: d89b58f7fd
2012-08-01 11:36:44 -05:00
Max Schenkelberg
74f0179b92 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]
Former-commit-id: cc0a1fbca3
2012-08-01 10:51:32 -05:00
Steve Harris
e0c3722fd1 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
2012-08-01 10:45:37 -05:00
James Korman
15af4ada93 Issue #798 - Code review changes
Former-commit-id: 14e68406b4 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]
Former-commit-id: 39a32d7c91
2012-07-31 14:34:27 -05:00
James Korman
5df52e38f9 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]
Former-commit-id: 4cbbc59278
2012-07-31 13:38:23 -05:00
Nate Jensen
00bbb6c8a3 Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]
Former-commit-id: 69f51e6e87
2012-07-31 10:02:39 -05:00
Richard Peter
c379c2f884 Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]
Former-commit-id: 8631b64e75
2012-07-31 09:16:23 -05:00
Nate Jensen
8fa0eb70db Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]
Former-commit-id: 4a2841b287
2012-07-31 08:57:54 -05:00
Ron Anderson
6a3e6f599f Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]
Former-commit-id: b1650b6143
2012-07-31 08:36:27 -05:00
Ron Anderson
6b7f1b3611 Issue #851 removed obsolete GFE code.
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: 35d140f0fb [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]
Former-commit-id: d87c0b6c4b
2012-07-30 15:34:16 -05:00
Bryan Kowal
9fe0b6a424 Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f

Former-commit-id: c74e48e4a4 [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]
Former-commit-id: aa5b16537f
2012-07-29 09:40:01 -05:00
Bryan Kowal
107831f23d Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6

Former-commit-id: 327ffa9439 [formerly dca54e56436ace397c6163b03ac4edb480336404]
Former-commit-id: cd40d9accf
2012-07-28 08:52:36 -05:00
Richard Peter
d131cd42cf Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
Former-commit-id: 9e3cd2546a [formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]
Former-commit-id: 77c2ab2c05
2012-07-27 14:50:00 -05:00
Steve Harris
b82d6772c3 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]
Former-commit-id: 4688ac304f
2012-07-27 14:50:45 -05:00
Steve Harris
2aa4114e4d Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 587bb6a274
2012-07-27 14:44:44 -05:00
Max Schenkelberg
51f9666fcb Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM.  Also changed MessageGenerator to use new class for finding the wmo header

Amend: Added try-finally for input stream in DataUnzipper

Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1

Former-commit-id: 756988cb8b [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]
Former-commit-id: b669f57ee4
2012-07-27 14:42:36 -05:00
Nate Jensen
67edb6917d Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]
Former-commit-id: dbe185f3a0
2012-07-26 17:43:29 -05:00
Bryan Kowal
74e2382060 Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269

Former-commit-id: 7b44eaafe7 [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]
Former-commit-id: b30c43883d
2012-07-26 13:47:25 -05:00
Ben Steffensmeier
3e9abe8682 Issue #924 fix some concurrency issues for GridResource
Former-commit-id: e18782687c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]
Former-commit-id: de742a4b8c
2012-07-25 17:33:24 -05:00
Bryan Kowal
8b44fbfb4f Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d

Former-commit-id: e31fd00613 [formerly b66b6fd7498e441290772be4b6906e58ac385511]
Former-commit-id: 2011493fda
2012-07-25 14:13:35 -05:00
Ben Steffensmeier
6f9ec1af50 Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: e3cfa52237 [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]
Former-commit-id: 044836cd2c
2012-07-24 11:29:51 -05:00
Bryan Kowal
efefe956d2 Issue #768 - scripts no longer need to be executable.
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83

Former-commit-id: fe4a515422 [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]
Former-commit-id: 88fdb461ea
2012-07-24 10:12:33 -05:00
Ron Anderson
bc034e1863 Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 1f2e581534 [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]
Former-commit-id: b52f1400ef
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
cb08c202ef Issue #924 fix concurrency issues for Grid products
Former-commit-id: 0b951d425d [formerly 767173dc95dc811bc94081415a214803403985f5]
Former-commit-id: 9abd645758
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
10706db0b1 Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757

Former-commit-id: 5df07dac9f [formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]
Former-commit-id: 98218ec3cd
2012-07-19 17:12:31 -05:00
Steve Harris
9f97182964 12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
2012-07-19 16:20:40 -05:00
Nate Jensen
33611406a4 Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development
Former-commit-id: bad816a50e [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]
Former-commit-id: 0fd6c7d56c
2012-07-19 15:31:55 -05:00
Nate Jensen
ad3952fc07 Merge "Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing." into development
Former-commit-id: 334ba86ef4 [formerly 6e91bbe07a17896a59969671ddc414d8f9029a9f]
Former-commit-id: 8b3819cf44
2012-07-19 13:37:51 -05:00
Max Schenkelberg
bc0ec0455d Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: c8909c0fbc [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]
Former-commit-id: d8971a72fd
2012-07-19 11:45:01 -05:00
Bryan Kowal
56a2fa4068 Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e

Former-commit-id: 10cde34ffe [formerly 47b881f604fec3591827f66481ff820032278aa0]
Former-commit-id: 95d0565b6d
2012-07-19 11:05:13 -05:00
Bryan Kowal
30e2defaf8 Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 1e13956bce [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]
Former-commit-id: 132870666a
2012-07-19 09:31:34 -05:00
Ben Steffensmeier
1393fa1d14 Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
Former-commit-id: 144dd7bab9 [formerly 84055039ccd601f4be4546f97cde99faf33b7818]
Former-commit-id: eab4b1cd78
2012-07-18 17:53:51 -05:00
Bryan Kowal
d908d0add3 Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208

Former-commit-id: 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]
Former-commit-id: 7524f8ad8d
2012-07-18 11:12:09 -05:00
Nate Jensen
aef9a4a202 Merge "Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now" into development
Former-commit-id: 348eca2c4c [formerly e7bc3cec2a68d9041719126d484bb8f5c03eed2c]
Former-commit-id: 5cdf7b27f6
2012-07-16 13:58:03 -05:00
Roger Ferrel
aa7b01b330 Issue #875 Modfications to prevent null pointer exeception when no map displayed.
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504

Former-commit-id: c908de0d82 [formerly 7eaa2860847149879bb62a637e6677675dd5c7ec]
Former-commit-id: 3cfd8547b4
2012-07-16 11:10:23 -05:00
Max Schenkelberg
cd9e7563de Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now
Change-Id: I8f87118b3e283acc5c19dc97497730b9cabec0f1

Former-commit-id: a9360b7078 [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]
Former-commit-id: dcdffe345d
2012-07-16 10:00:28 -05:00
Bryan Kowal
90e005eec4 Issue #889 - specified the full path to awips2-ant.
Former-commit-id: c32bb9556e [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]
Former-commit-id: 41bb75fa61
2012-07-14 08:51:00 -05:00
Richard Peter
3c1f3d3d0a Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: 19203d87f3 [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]
Former-commit-id: ee6738152d
2012-07-13 09:18:46 -05:00
Nate Jensen
565100d787 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: c0dad4432c [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]
Former-commit-id: 1b3d6560e4
2012-07-12 17:17:57 -05:00
Nate Jensen
798ac5882f Merge "Issue #875 - Create com.raytheon.uf.viz.points" into development
Former-commit-id: 34a3d7b141 [formerly 78f6d94e5be35624e63960196ed3a56bd72306a9]
Former-commit-id: 73e087494c
2012-07-12 14:58:20 -05:00
Ben Steffensmeier
1c68f4e01e Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: ea0c7046af [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]
Former-commit-id: 8984b35ff8
2012-07-12 13:35:52 -05:00
Bryan Kowal
46198b0c92 Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]
Former-commit-id: 1e5b71ee7b
2012-07-12 12:58:40 -05:00
Roger Ferrel
b3df932794 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 0cf7d64cf4 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]
Former-commit-id: 9071334fe9
2012-07-12 11:32:03 -05:00
Bryan Kowal
00c9a0f708 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: 0f31fadffa [formerly ea1b0920d908481e28477329497204dda324bd3e]
Former-commit-id: bde6be6e2b
2012-07-11 17:31:55 -05:00
Bryan Kowal
5619099acd Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 5058c32c34 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]
Former-commit-id: 31f2db8719
2012-07-11 16:28:28 -05:00
Bryan Kowal
424bbaf0f7 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]
Former-commit-id: 3b7c761f99
2012-07-11 12:44:32 -05:00
Bryan Kowal
7ace6b7acb Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.


Former-commit-id: b79f5a3c2b [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]
Former-commit-id: c7a172f97a
2012-07-11 09:42:46 -05:00
Bryan Kowal
fa5eb7a16a Merge branch 'merge_development' into development
Former-commit-id: 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]
Former-commit-id: b27994c9b1
2012-07-10 17:03:21 -05:00
Bryan Kowal
580172b47c Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: f92eb59a73
2012-07-10 16:57:16 -05:00
Nate Jensen
3fbdc016c5 Merge "Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API. Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998" into development
Former-commit-id: 2af538f200 [formerly 95d4cacc92bbf5531ca54c3a4dda811ea402ac84]
Former-commit-id: ee43626e2e
2012-07-10 16:06:28 -05:00