Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1f2d189..2843e12 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -693,6 +693,17 @@
     ;LevelUpload = 0
 
 
+[Textures]
+    ; If true, textures generated dynamically (i.e. through osSetDynamicTextureData() and similar OSSL functions) are reused where possible
+    ; Chiefly, reuse occurs if a texture has already been generated with identical data and settings, and that texture contains no dynamic components
+    ; (e.g. images pulled from an external HTTP address).
+    ; 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.
+    ; Currently, it will also increase asset cache use since temporary dynamic textures are no longer deleted.
+    ; Hence, currently considered experimental.
+    ; Default is false.
+    ReuseDynamicTextures = false
+
+
 [ODEPhysicsSettings]
     ; ## 
     ; ## Physics stats settings