aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorMelanie2011-05-09 01:04:55 +0100
committerMelanie2011-05-09 01:04:55 +0100
commit66a5906548f70614d7eac3f49e9b0c84843a3600 (patch)
tree0514266b0faed359c83a3d0498e4c3d37a3897a5 /OpenSim/Capabilities
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-66a5906548f70614d7eac3f49e9b0c84843a3600.zip
opensim-SC_OLD-66a5906548f70614d7eac3f49e9b0c84843a3600.tar.gz
opensim-SC_OLD-66a5906548f70614d7eac3f49e9b0c84843a3600.tar.bz2
opensim-SC_OLD-66a5906548f70614d7eac3f49e9b0c84843a3600.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 00ff3d0..105a1e0 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Capabilities.Handlers
73 string textureStr = query.GetOne("texture_id"); 73 string textureStr = query.GetOne("texture_id");
74 string format = query.GetOne("format"); 74 string format = query.GetOne("format");
75 75
76 m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr); 76 //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
77 77
78 if (m_assetService == null) 78 if (m_assetService == null)
79 { 79 {