aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2009-10-06 11:08:11 -0700
committerDiva Canto2009-10-06 11:08:11 -0700
commit77b4abaa251929a4d6079d766f041f997071dc46 (patch)
tree3feb73cc830f17a9c640eb372df6fd83ff888fa1 /OpenSim/Server
parentRemoving dependencies on System.Runtime.Remoting. (diff)
downloadopensim-SC_OLD-77b4abaa251929a4d6079d766f041f997071dc46.zip
opensim-SC_OLD-77b4abaa251929a4d6079d766f041f997071dc46.tar.gz
opensim-SC_OLD-77b4abaa251929a4d6079d766f041f997071dc46.tar.bz2
opensim-SC_OLD-77b4abaa251929a4d6079d766f041f997071dc46.tar.xz
* Removed verbose debug message
* Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers * Fixed a stupid bug in the InventoryConnector which was making move items do things twice
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs1
2 files changed, 2 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
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index ca45263..3c92209 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -77,6 +77,7 @@ namespace OpenSim.Server.Handlers.Inventory
77 m_doLookup = serverConfig.GetBoolean("SessionAuthentication", false); 77 m_doLookup = serverConfig.GetBoolean("SessionAuthentication", false);
78 78
79 AddHttpHandlers(server); 79 AddHttpHandlers(server);
80 m_log.Debug("[INVENTORY HANDLER]: handlers initialized");
80 } 81 }
81 82
82 protected virtual void AddHttpHandlers(IHttpServer m_httpServer) 83 protected virtual void AddHttpHandlers(IHttpServer m_httpServer)