diff options
| author | John Hurliman | 2009-11-05 13:10:58 -0800 |
|---|---|---|
| committer | John Hurliman | 2009-11-05 13:10:58 -0800 |
| commit | afef1ac191d32e9c1514c294b17e404b1d4ae217 (patch) | |
| tree | c390ef81c9c30922c2e95e32844832919884fd9c /OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |
| parent | Applying #4332, optional packet statistics logging (diff) | |
| download | opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.zip opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.gz opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.bz2 opensim-SC_OLD-afef1ac191d32e9c1514c294b17e404b1d4ae217.tar.xz | |
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
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 7456e8c..5fde35f 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 | ||