diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/CoreModules/Scripting/DynamicTexture | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 9d77b19..a686a4d 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -514,9 +514,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
514 | scene.RegionInfo.RegionID.ToString()); | 514 | scene.RegionInfo.RegionID.ToString()); |
515 | asset.Data = assetData; | 515 | asset.Data = assetData; |
516 | asset.Description = String.Format("URL image : {0}", Url); | 516 | asset.Description = String.Format("URL image : {0}", Url); |
517 | asset.Local = false; | 517 | if (asset.Description.Length > 128) |
518 | asset.Description = asset.Description.Substring(0, 128); | ||
519 | asset.Local = true; // dynamic images aren't saved in the assets server | ||
518 | asset.Temporary = ((Disp & DISP_TEMP) != 0); | 520 | asset.Temporary = ((Disp & DISP_TEMP) != 0); |
519 | scene.AssetService.Store(asset); | 521 | scene.AssetService.Store(asset); // this will only save the asset in the local asset cache |
520 | 522 | ||
521 | IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); | 523 | IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>(); |
522 | if (cacheLayerDecode != null) | 524 | if (cacheLayerDecode != null) |