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

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
arthursv
Diva Canto 2009-08-19 16:15:04 -07:00
parent 51e487a172
commit c295354ea0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
{ {
InventoryFolderBase root = GetRootFolder(userID); InventoryFolderBase root = m_InventoryService.GetRootFolder(userID);
if (root != null) if (root != null)
{ {
InventoryCollection content = GetFolderContent(userID, root.ID); 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)) 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; folders[(AssetType)folder.Type] = folder;
} }
} }
// Put the root folder there, as type Folder // Put the root folder there, as type Folder
folders[AssetType.Folder] = root; 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; return folders;
} }

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -179,8 +179,8 @@ namespace OpenSim.Region.Framework.Scenes
else else
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update", "[AGENT INVENTORY]: Could not find item {0} for caps inventory update",
remoteClient.AgentId); itemID);
} }
return UUID.Zero; return UUID.Zero;