aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-28 20:35:17 +0100
committerJustin Clark-Casey (justincc)2012-08-28 20:35:17 +0100
commitaa44df9c04658cfa0af9a0f203faea5e493c6f25 (patch)
treee0a7b2e883bea2d2d2a4acc7f65c46a732c646ec /OpenSim/Region/Framework
parentcopying documentation from http://opensimulator.org/wiki/Threat_level (diff)
downloadopensim-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/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs2
1 files changed, 1 insertions, 1 deletions
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,