diff options
author | Justin Clark-Casey (justincc) | 2012-08-28 20:35:17 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-28 20:35:17 +0100 |
commit | aa44df9c04658cfa0af9a0f203faea5e493c6f25 (patch) | |
tree | e0a7b2e883bea2d2d2a4acc7f65c46a732c646ec /OpenSim | |
parent | copying documentation from http://opensimulator.org/wiki/Threat_level (diff) | |
download | opensim-SC_OLD-aa44df9c04658cfa0af9a0f203faea5e493c6f25.zip opensim-SC_OLD-aa44df9c04658cfa0af9a0f203faea5e493c6f25.tar.gz opensim-SC_OLD-aa44df9c04658cfa0af9a0f203faea5e493c6f25.tar.bz2 opensim-SC_OLD-aa44df9c04658cfa0af9a0f203faea5e493c6f25.tar.xz |
Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
Diffstat (limited to 'OpenSim')
3 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 6f83948..6e38b3f 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
72 | return null; | 72 | return null; |
73 | } | 73 | } |
74 | 74 | ||
75 | public byte[] ConvertStream(Stream data, string extraParams) | 75 | public byte[] ConvertData(string bodyData, string extraParams) |
76 | { | 76 | { |
77 | return null; | 77 | return null; |
78 | } | 78 | } |
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index f988c0e..3a758c5 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -78,9 +78,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
78 | return null; | 78 | return null; |
79 | } | 79 | } |
80 | 80 | ||
81 | public byte[] ConvertStream(Stream data, string extraParams) | 81 | public byte[] ConvertData(string bodyData, string extraParams) |
82 | { | 82 | { |
83 | return null; | 83 | return Draw(bodyData, extraParams); |
84 | } | 84 | } |
85 | 85 | ||
86 | public bool AsyncConvertUrl(UUID id, string url, string extraParams) | 86 | public bool AsyncConvertUrl(UUID id, string url, string extraParams) |
@@ -90,7 +90,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
90 | 90 | ||
91 | public bool AsyncConvertData(UUID id, string bodyData, string extraParams) | 91 | public bool AsyncConvertData(UUID id, string bodyData, string extraParams) |
92 | { | 92 | { |
93 | Draw(bodyData, id, extraParams); | 93 | // XXX: This isn't actually being done asynchronously! |
94 | m_textureManager.ReturnData(id, ConvertData(bodyData, extraParams)); | ||
94 | return true; | 95 | return true; |
95 | } | 96 | } |
96 | 97 | ||
@@ -161,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
161 | 162 | ||
162 | #endregion | 163 | #endregion |
163 | 164 | ||
164 | private void Draw(string data, UUID id, string extraParams) | 165 | private byte[] Draw(string data, string extraParams) |
165 | { | 166 | { |
166 | // We need to cater for old scripts that didnt use extraParams neatly, they use either an integer size which represents both width and height, or setalpha | 167 | // We need to cater for old scripts that didnt use extraParams neatly, they use either an integer size which represents both width and height, or setalpha |
167 | // we will now support multiple comma seperated params in the form width:256,height:512,alpha:255 | 168 | // we will now support multiple comma seperated params in the form width:256,height:512,alpha:255 |
@@ -358,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
358 | e.Message, e.StackTrace); | 359 | e.Message, e.StackTrace); |
359 | } | 360 | } |
360 | 361 | ||
361 | m_textureManager.ReturnData(id, imageJ2000); | 362 | return imageJ2000; |
362 | } | 363 | } |
363 | finally | 364 | finally |
364 | { | 365 | { |
diff --git a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index 8954513..773ba73 100644 --- a/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
114 | string GetContentType(); | 114 | string GetContentType(); |
115 | bool SupportsAsynchronous(); | 115 | bool SupportsAsynchronous(); |
116 | byte[] ConvertUrl(string url, string extraParams); | 116 | byte[] ConvertUrl(string url, string extraParams); |
117 | byte[] ConvertStream(Stream data, string extraParams); | 117 | byte[] ConvertData(string bodyData, string extraParams); |
118 | bool AsyncConvertUrl(UUID id, string url, string extraParams); | 118 | bool AsyncConvertUrl(UUID id, string url, string extraParams); |
119 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); | 119 | bool AsyncConvertData(UUID id, string bodyData, string extraParams); |
120 | void GetDrawStringSize(string text, string fontName, int fontSize, | 120 | void GetDrawStringSize(string text, string fontName, int fontSize, |