aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-10-06 11:08:11 -0700
committerDiva Canto2009-10-06 11:08:11 -0700
commit77b4abaa251929a4d6079d766f041f997071dc46 (patch)
tree3feb73cc830f17a9c640eb372df6fd83ff888fa1
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
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs7
5 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index bb9a4b2..879cc70 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
98 98
99 m_log.Info("[RegionAssetService]: Starting..."); 99 m_log.Info("[RegionAssetService]: Starting...");
100 100
101 Object[] args = new Object[] { m_Config, MainServer.Instance }; 101 Object[] args = new Object[] { m_Config, MainServer.Instance, string.Empty };
102 102
103 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); 103 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
104 } 104 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index c326818..54c6d89 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
98 98
99 m_log.Info("[RegionInventoryService]: Starting..."); 99 m_log.Info("[RegionInventoryService]: Starting...");
100 100
101 Object[] args = new Object[] { m_Config, MainServer.Instance }; 101 Object[] args = new Object[] { m_Config, MainServer.Instance, String.Empty };
102 102
103 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); 103 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
104 } 104 }
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)
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 5443891..e047f71 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -416,13 +416,6 @@ namespace OpenSim.Services.Connectors
416 e.Source, e.Message); 416 e.Source, e.Message);
417 } 417 }
418 418
419 foreach (InventoryItemBase item in items)
420 {
421 InventoryItemBase itm = this.QueryItem(userID, item, sessionID);
422 itm.Name = item.Name;
423 itm.Folder = item.Folder;
424 this.UpdateItem(userID, itm, sessionID);
425 }
426 } 419 }
427 420
428 private void MoveItemsCompleted(IAsyncResult iar) 421 private void MoveItemsCompleted(IAsyncResult iar)