aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServerUtils.cs
diff options
context:
space:
mode:
authorMelanie2009-10-08 10:32:15 +0100
committerMelanie2009-10-08 10:32:15 +0100
commitf6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch)
treede16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Server/Base/ServerUtils.cs
parentCorrect a build break caused by an optimization in trunk (diff)
parentRemove ThreadTrackerTest. It's no longer relevant because the thread (diff)
downloadopensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Server/Base/ServerUtils.cs')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 9d9735e..0964caa 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Server.Base
260 260
261 public static Dictionary<string, object> ParseXmlResponse(string data) 261 public static Dictionary<string, object> ParseXmlResponse(string data)
262 { 262 {
263 m_log.DebugFormat("[XXX]: received xml string: {0}", data); 263 //m_log.DebugFormat("[XXX]: received xml string: {0}", data);
264 264
265 Dictionary<string, object> ret = new Dictionary<string, object>(); 265 Dictionary<string, object> ret = new Dictionary<string, object>();
266 266