OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
prioritization
Diva Canto 2009-10-06 11:08:11 -07:00
parent 3db4d38645
commit 77b4abaa25
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
m_log.Info("[RegionAssetService]: Starting..."); m_log.Info("[RegionAssetService]: Starting...");
Object[] args = new Object[] { m_Config, MainServer.Instance }; Object[] args = new Object[] { m_Config, MainServer.Instance, string.Empty };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
m_log.Info("[RegionInventoryService]: Starting..."); m_log.Info("[RegionInventoryService]: Starting...");
Object[] args = new Object[] { m_Config, MainServer.Instance }; Object[] args = new Object[] { m_Config, MainServer.Instance, String.Empty };
ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
} }

2
OpenSim/Server/Base/ServerUtils.cs
View File

@ -260,7 +260,7 @@ namespace OpenSim.Server.Base
public static Dictionary<string, object> ParseXmlResponse(string data) public static Dictionary<string, object> ParseXmlResponse(string data)
{ {
m_log.DebugFormat("[XXX]: received xml string: {0}", data); //m_log.DebugFormat("[XXX]: received xml string: {0}", data);
Dictionary<string, object> ret = new Dictionary<string, object>(); Dictionary<string, object> ret = new Dictionary<string, object>();

1
OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
View File

@ -77,6 +77,7 @@ namespace OpenSim.Server.Handlers.Inventory
m_doLookup = serverConfig.GetBoolean("SessionAuthentication", false); m_doLookup = serverConfig.GetBoolean("SessionAuthentication", false);
AddHttpHandlers(server); AddHttpHandlers(server);
m_log.Debug("[INVENTORY HANDLER]: handlers initialized");
} }
protected virtual void AddHttpHandlers(IHttpServer m_httpServer) protected virtual void AddHttpHandlers(IHttpServer m_httpServer)

7
OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
View File

@ -416,13 +416,6 @@ namespace OpenSim.Services.Connectors
e.Source, e.Message); e.Source, e.Message);
} }
foreach (InventoryItemBase item in items)
{
InventoryItemBase itm = this.QueryItem(userID, item, sessionID);
itm.Name = item.Name;
itm.Folder = item.Folder;
this.UpdateItem(userID, itm, sessionID);
}
} }
private void MoveItemsCompleted(IAsyncResult iar) private void MoveItemsCompleted(IAsyncResult iar)