aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs5
-rw-r--r--bin/OpenSimDefaults.ini11
2 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index f169117..3eedf49 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -283,6 +283,10 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
283 283
284 public void Initialise(Scene scene, IConfigSource config) 284 public void Initialise(Scene scene, IConfigSource config)
285 { 285 {
286 IConfig texturesConfig = config.Configs["Textures"];
287 if (texturesConfig != null)
288 ReuseTextures = texturesConfig.GetBoolean("ReuseDynamicTextures", false);
289
286 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) 290 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
287 { 291 {
288 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); 292 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
@@ -292,7 +296,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
292 296
293 public void PostInitialise() 297 public void PostInitialise()
294 { 298 {
295// ReuseTextures = true;
296 if (ReuseTextures) 299 if (ReuseTextures)
297 { 300 {
298 m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative); 301 m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative);
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b2fca0c..42b295f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -693,6 +693,17 @@
693 ;LevelUpload = 0 693 ;LevelUpload = 0
694 694
695 695
696[Textures]
697 ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
698 ; Chiefly, reuse occurs if a texture has already been generated with identical data and settings, and that texture contains no dynamic components
699 ; (e.g. images pulled from an external HTTP address).
700 ; Reusing previously generated textures results in a much faster update on the viewer but may cause issues if the viewer didn't receive all resolutions of the texture.
701 ; Currently, it will also increase asset cache use since temporary dynamic textures are no longer deleted.
702 ; Hence, currently considered experimental.
703 ; Default is false.
704 ReuseDynamicTextures = false
705
706
696[ODEPhysicsSettings] 707[ODEPhysicsSettings]
697 ; ## 708 ; ##
698 ; ## Physics stats settings 709 ; ## Physics stats settings