aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
authorMelanie2011-05-09 01:00:35 +0200
committerMelanie2011-05-09 01:00:35 +0200
commit73a9ebc21e1904fcc2a1f2cf6656d406c2e2c46f (patch)
tree4b4cb0ce58566cba97e37e1f295c93681226c6db /OpenSim/Capabilities
parentAdd commands to delete objects by name, UUID, creator or owner (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-73a9ebc21e1904fcc2a1f2cf6656d406c2e2c46f.zip
opensim-SC_OLD-73a9ebc21e1904fcc2a1f2cf6656d406c2e2c46f.tar.gz
opensim-SC_OLD-73a9ebc21e1904fcc2a1f2cf6656d406c2e2c46f.tar.bz2
opensim-SC_OLD-73a9ebc21e1904fcc2a1f2cf6656d406c2e2c46f.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster 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 {