aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/LoadImageURL
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-28 23:06:53 +0100
committerJustin Clark-Casey (justincc)2012-08-28 23:06:53 +0100
commitc1cece4b82d24a17a09b66c9ec3975190cc05d95 (patch)
tree702963505eb8a359d9e0ce6f92964b3a03ac3cbe /OpenSim/Region/CoreModules/Scripting/LoadImageURL
parentAdd IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove... (diff)
downloadopensim-SC_OLD-c1cece4b82d24a17a09b66c9ec3975190cc05d95.zip
opensim-SC_OLD-c1cece4b82d24a17a09b66c9ec3975190cc05d95.tar.gz
opensim-SC_OLD-c1cece4b82d24a17a09b66c9ec3975190cc05d95.tar.bz2
opensim-SC_OLD-c1cece4b82d24a17a09b66c9ec3975190cc05d95.tar.xz
Add experimental DynamicTextureModule.ReuseTextures flag, currently only configurable on compile.
Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LoadImageURL')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 6e38b3f..2b3a0f2 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -67,6 +67,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
67 return true; 67 return true;
68 } 68 }
69 69
70// public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
71// {
72// // We don't support conversion of body data.
73// return false;
74// }
75
70 public byte[] ConvertUrl(string url, string extraParams) 76 public byte[] ConvertUrl(string url, string extraParams)
71 { 77 {
72 return null; 78 return null;
@@ -236,9 +242,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
236 stream.Close(); 242 stream.Close();
237 } 243 }
238 } 244 }
245
239 m_log.DebugFormat("[LOADIMAGEURLMODULE] Returning {0} bytes of image data for request {1}", 246 m_log.DebugFormat("[LOADIMAGEURLMODULE] Returning {0} bytes of image data for request {1}",
240 imageJ2000.Length, state.RequestID); 247 imageJ2000.Length, state.RequestID);
241 m_textureManager.ReturnData(state.RequestID, imageJ2000); 248
249 m_textureManager.ReturnData(state.RequestID, imageJ2000, false);
242 } 250 }
243 251
244 #region Nested type: RequestState 252 #region Nested type: RequestState