From c295354ea035c7e62f8a2c58868d2303a3ede883 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 16:15:04 -0700
Subject: Fixes GetRootFolder for normal standalone, which was being
incorrectly redirected to the wrong object. Probably fixes most grief in
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
---
.../Inventory/LocalInventoryServiceConnector.cs | 6 +++---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 562c5dd..e6edcf2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
{
- InventoryFolderBase root = GetRootFolder(userID);
+ InventoryFolderBase root = m_InventoryService.GetRootFolder(userID);
if (root != null)
{
InventoryCollection content = GetFolderContent(userID, root.ID);
@@ -202,13 +202,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
{
- m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type);
+ //m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type);
folders[(AssetType)folder.Type] = folder;
}
}
// Put the root folder there, as type Folder
folders[AssetType.Folder] = root;
- m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type);
+ //m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type);
return folders;
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a119efc..a9d361b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -179,8 +179,8 @@ namespace OpenSim.Region.Framework.Scenes
else
{
m_log.ErrorFormat(
- "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update",
- remoteClient.AgentId);
+ "[AGENT INVENTORY]: Could not find item {0} for caps inventory update",
+ itemID);
}
return UUID.Zero;
--
cgit v1.1