Inventory should be working again in sandbox mode

4 files changed, 17 insertions, 1 deletions

diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index 57ee7d9..a3c6cec 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -101,6 +101,19 @@ namespace OpenSim.Framework.Inventory
             return false;

         }

 

+        public LLUUID GetFolderID(string folderName)

+        {

+            foreach (InventoryFolder inv in this.InventoryFolders.Values)

+            {

+                if (inv.FolderName == folderName)

+                {

+                    return inv.FolderID;

+                }

+            }

+

+            return LLUUID.Zero;

+        }

+

         public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)

         {

             if(this.InventoryItems.ContainsKey(itemID))

diff --git a/OpenSim.Servers/LoginResponse.cs b/OpenSim.Servers/LoginResponse.cs
index c51b8b1..ac4d2ab 100644
--- a/OpenSim.Servers/LoginResponse.cs
+++ b/OpenSim.Servers/LoginResponse.cs
@@ -183,6 +183,8 @@ namespace OpenSim.UserServer
             this.SecureSessionID = LLUUID.Random();

 

             this.userProfile.Inventory.CreateRootFolder(this.userProfile.UUID, true);

+            this.baseFolderID = this.userProfile.Inventory.GetFolderID("Textures");

+            this.inventoryFolderID = this.userProfile.Inventory.GetFolderID("My Inventory-");

             Hashtable InventoryRootHash = new Hashtable();

             InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated();

             this.inventoryRoot.Add(InventoryRootHash);

diff --git a/OpenSim.Servers/LoginServer.cs b/OpenSim.Servers/LoginServer.cs
index 44038ff..0aeb15a 100644
--- a/OpenSim.Servers/LoginServer.cs
+++ b/OpenSim.Servers/LoginServer.cs
@@ -192,6 +192,7 @@ namespace OpenSim.UserServer
             _login.Agent = loginResponse.AgentID;

             _login.Session = loginResponse.SessionID;

             _login.SecureSession = loginResponse.SecureSessionID;

+

             _login.BaseFolder = loginResponse.BaseFolderID;

             _login.InventoryFolder = loginResponse.InventoryFolderID;

 

diff --git a/OpenSim.sln b/OpenSim.sln
index 6788be5..76fd8ec 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+# Visual C# Express 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"