diff options
| author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
| commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
| tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |
| parent | refactor out iar escaping (diff) | |
| parent | remove the debug stuff (diff) | |
| download | opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC_OLD-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 13fbb60..7ac8bed 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
| @@ -238,12 +238,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
| 238 | 238 | ||
| 239 | if (m_cache != null) | 239 | if (m_cache != null) |
| 240 | { | 240 | { |
| 241 | AssetBase layerDecodeAsset = new AssetBase(); | 241 | string assetID = "j2kCache_" + AssetId.ToString(); |
| 242 | layerDecodeAsset.ID = "j2kCache_" + AssetId.ToString(); | 242 | |
| 243 | AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard); | ||
| 243 | layerDecodeAsset.Local = true; | 244 | layerDecodeAsset.Local = true; |
| 244 | layerDecodeAsset.Name = layerDecodeAsset.ID; | ||
| 245 | layerDecodeAsset.Temporary = true; | 245 | layerDecodeAsset.Temporary = true; |
| 246 | layerDecodeAsset.Type = (sbyte)AssetType.Notecard; | ||
| 247 | 246 | ||
| 248 | #region Serialize Layer Data | 247 | #region Serialize Layer Data |
| 249 | 248 | ||