xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
726 commits 31 branches 40 tags 3.8 GiB
Commit graph

33 commits

Author SHA1 Message Date
Max Schenkelberg
1b406ecfca Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes. 
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: 564b38b30562a371cf0345de572b32ea8f53e82e
 2012-08-20 14:47:14 -05:00
James Korman
317acc38fe Issue #798 - Force interpolationLevels in derived satellite 
Former-commit-id: ffcc7cfa6e7c2ce0f406becff390781ceee7faa3
 2012-08-03 14:14:53 -05:00
James Korman
4cbbc59278 Issue #798 - Code review changes 
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: cb05a9f95384806537106dc804833331d6c7db48
 2012-07-31 13:38:23 -05:00
Steve Harris
4688ac304f Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: d2a398126648eaf391ddf39f99a77c0f40d08618
 2012-07-27 14:50:45 -05:00
Steve Harris
587bb6a274 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: b866ca00a3bbfc7edd9e941bd5f84699fc21b255
 2012-07-27 14:44:44 -05:00
Nate Jensen
dbe185f3a0 Issue #882 fix auto updates, more efficiently set simulated time 
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: da03e63d10f5f7b6fa77d0e302b11e7501475e22
 2012-07-26 17:43:29 -05:00
Nate Jensen
0fd6c7d56c 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: 3786f2c0a7add2d36b27b92e2a8efd235b65e147
 2012-07-19 15:31:55 -05:00
Max Schenkelberg
d8971a72fd 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: fb323d9e48c7f35f68d188d4f8fbb677971ebbb1
 2012-07-19 11:45:01 -05:00
Ben Steffensmeier
eab4b1cd78 Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing. 
Former-commit-id: 84055039ccd601f4be4546f97cde99faf33b7818
 2012-07-18 17:53:51 -05:00
Ben Steffensmeier
79ab850efa Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API. 
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 009e769a180898cb62e9df4a604b40e139cf2886
 2012-07-10 16:04:56 -05:00
Steve Harris
27afa60345 12.6.1-9 baseline 
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
 2012-07-10 07:53:49 -05:00
Max Schenkelberg
98c2ec7dc5 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function 
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050
 2012-07-06 16:01:47 -05:00
Bryan Kowal
b87b66abc5 Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	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.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: af5a90e383c1c115b363a33d9e72f957ada697a4
 2012-06-27 17:21:48 -05:00
Steve Harris
3cd0902b49 12.6.1-10 baseline 
Former-commit-id: dd65e6d99709e0117519a1f2a2f02a41c8938d0e
 2012-06-21 08:58:00 -05:00
Ben Steffensmeier
0c69731e18 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later 
Former-commit-id: 65e7e8b2c891d1938f0b98c3c8737f18517fe27f
 2012-06-20 14:13:37 -05:00
Bryan Kowal
f0e3b957e3 Merge branch '11-Collaboration' into development 
Conflicts:
	cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java

Former-commit-id: 9e117e495d669e310839bc9ff8e1e8207b03491b
 2012-06-18 11:16:28 -05:00
Steve Harris
31b3e87ffa Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

All of these were 'self-resolved' when kdiff3 invoked


Former-commit-id: f98354aae305ad227eaf3b36e4393b8aefc80f02
 2012-05-09 13:19:47 -05:00
Steve Harris
58037cb5d1 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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
 2012-05-09 13:14:00 -05:00
Steve Harris
b36c69cc67 12.5.1-2 baseline 
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
 2012-05-03 19:17:13 -05:00
Steve Harris
7b75b781ad 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: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
 2012-05-01 18:31:09 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline 
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
 2012-05-01 18:06:13 -05:00
Dave Hladky
5b7ecea866 Issue #15 Re-wrote SimDate integration for menus, alert observers after 
merge headache.

Former-commit-id: 647b7ac154dbdaf945231b231f491bbca86d2a24
 2012-04-30 13:43:34 -05:00
Steve Harris
625cd4262c Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 
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

Former-commit-id: 5e1b9319941eed516a08a135a2049c14bad77863
 2012-04-19 11:11:02 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Steve Harris
fee53dea94 Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge 
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
 2012-04-10 12:50:03 -05:00
Max Schenkelberg
d2d03e2c64 Issue #239 Start of remote target capabilities 
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
 2012-04-03 15:11:20 -05:00
Max Schenkelberg
50765e8a34 Issue #358 Cleaned up mesh extension and API to use geotools for 
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 7e4abe637edacca71e1e1c98d99521cd33415fb0
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
89f603f448 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904
 2012-03-09 12:31:50 -06:00
Steve Harris
496cc6a06b 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: 85082f273a85a3967d54d4a489b6ea973d0688be
 2012-02-20 16:38:06 -06:00
Steve Harris
b137302802 Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
 2012-02-17 10:55:02 -06:00
Dave Hladky
b03b324ead Issue #15 Wes2Bridge time settings 
Former-commit-id: 61cb464263b06c01f4ea0b7270628f03e9e48d5a
 2012-01-25 10:53:51 -06:00
Matt Nash
c83e5ff474 Moving 12.1.1 into ss_sync 
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
 2012-01-19 11:53:12 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
 2012-01-06 08:55:05 -06:00