diff options
author | Melanie | 2012-08-29 03:31:13 +0100 |
---|---|---|
committer | Melanie | 2012-08-29 03:31:13 +0100 |
commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | implementing rule tracking (diff) | |
download | opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 6f83948..2b3a0f2 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -67,12 +67,18 @@ 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; |
73 | } | 79 | } |
74 | 80 | ||
75 | public byte[] ConvertStream(Stream data, string extraParams) | 81 | public byte[] ConvertData(string bodyData, string extraParams) |
76 | { | 82 | { |
77 | return null; | 83 | return null; |
78 | } | 84 | } |
@@ -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 |