aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 8215124..062a842 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Capabilities.Handlers
55 private IAssetService m_assetService; 55 private IAssetService m_assetService;
56 56
57 public const string DefaultFormat = "x-j2c"; 57 public const string DefaultFormat = "x-j2c";
58 58
59 public GetTextureHandler(IAssetService assService) 59 public GetTextureHandler(IAssetService assService)
60 { 60 {
61 m_assetService = assService; 61 m_assetService = assService;
@@ -83,7 +83,7 @@ namespace OpenSim.Capabilities.Handlers
83 if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID)) 83 if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out textureID))
84 { 84 {
85// m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID); 85// m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID);
86 86
87 string[] formats; 87 string[] formats;
88 if (!string.IsNullOrEmpty(format)) 88 if (!string.IsNullOrEmpty(format))
89 { 89 {
@@ -129,7 +129,7 @@ namespace OpenSim.Capabilities.Handlers
129 } 129 }
130 130
131 /// <summary> 131 /// <summary>
132 /// 132 ///
133 /// </summary> 133 /// </summary>
134 /// <param name="httpRequest"></param> 134 /// <param name="httpRequest"></param>
135 /// <param name="httpResponse"></param> 135 /// <param name="httpResponse"></param>
@@ -190,7 +190,7 @@ namespace OpenSim.Capabilities.Handlers
190 190
191 //response = new Hashtable(); 191 //response = new Hashtable();
192 192
193 193
194 //WriteTextureData(request,response,null,format); 194 //WriteTextureData(request,response,null,format);
195 // not found 195 // not found
196 //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found"); 196 //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
@@ -287,7 +287,7 @@ namespace OpenSim.Capabilities.Handlers
287 response["content_type"] = texture.Metadata.ContentType; 287 response["content_type"] = texture.Metadata.ContentType;
288 else 288 else
289 response["content_type"] = "image/" + format; 289 response["content_type"] = "image/" + format;
290 290
291 response["bin_response_data"] = texture.Data; 291 response["bin_response_data"] = texture.Data;
292 response["int_bytes"] = texture.Data.Length; 292 response["int_bytes"] = texture.Data.Length;
293 293
@@ -400,7 +400,7 @@ namespace OpenSim.Capabilities.Handlers
400 400
401 if (image != null) 401 if (image != null)
402 image.Dispose(); 402 image.Dispose();
403 403
404 if(managedImage != null) 404 if(managedImage != null)
405 managedImage.Clear(); 405 managedImage.Clear();
406 if (imgstream != null) 406 if (imgstream != null)