aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-05-13 13:10:15 +0000
committerMW2007-05-13 13:10:15 +0000
commit5917d36219d1143ff3129f6e2692ab25f2ea1b5f (patch)
tree0cdaa6aa3f1f6e5a0923a6f585b6f8f4e826353d
parentChanged to slightly better textures for the map: a blue one for the sea and o... (diff)
downloadopensim-SC_OLD-5917d36219d1143ff3129f6e2692ab25f2ea1b5f.zip
opensim-SC_OLD-5917d36219d1143ff3129f6e2692ab25f2ea1b5f.tar.gz
opensim-SC_OLD-5917d36219d1143ff3129f6e2692ab25f2ea1b5f.tar.bz2
opensim-SC_OLD-5917d36219d1143ff3129f6e2692ab25f2ea1b5f.tar.xz
Inventory should be working again in sandbox mode
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework/AgentInventory.cs13
-rw-r--r--OpenSim.Servers/LoginResponse.cs2
-rw-r--r--OpenSim.Servers/LoginServer.cs1
-rw-r--r--OpenSim.sln2
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
101 return false; 101 return false;
102 } 102 }
103 103
104 public LLUUID GetFolderID(string folderName)
105 {
106 foreach (InventoryFolder inv in this.InventoryFolders.Values)
107 {
108 if (inv.FolderName == folderName)
109 {
110 return inv.FolderID;
111 }
112 }
113
114 return LLUUID.Zero;
115 }
116
104 public bool UpdateItemAsset(LLUUID itemID, AssetBase asset) 117 public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
105 { 118 {
106 if(this.InventoryItems.ContainsKey(itemID)) 119 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
183 this.SecureSessionID = LLUUID.Random(); 183 this.SecureSessionID = LLUUID.Random();
184 184
185 this.userProfile.Inventory.CreateRootFolder(this.userProfile.UUID, true); 185 this.userProfile.Inventory.CreateRootFolder(this.userProfile.UUID, true);
186 this.baseFolderID = this.userProfile.Inventory.GetFolderID("Textures");
187 this.inventoryFolderID = this.userProfile.Inventory.GetFolderID("My Inventory-");
186 Hashtable InventoryRootHash = new Hashtable(); 188 Hashtable InventoryRootHash = new Hashtable();
187 InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated(); 189 InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated();
188 this.inventoryRoot.Add(InventoryRootHash); 190 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
192 _login.Agent = loginResponse.AgentID; 192 _login.Agent = loginResponse.AgentID;
193 _login.Session = loginResponse.SessionID; 193 _login.Session = loginResponse.SessionID;
194 _login.SecureSession = loginResponse.SecureSessionID; 194 _login.SecureSession = loginResponse.SecureSessionID;
195
195 _login.BaseFolder = loginResponse.BaseFolderID; 196 _login.BaseFolder = loginResponse.BaseFolderID;
196 _login.InventoryFolder = loginResponse.InventoryFolderID; 197 _login.InventoryFolder = loginResponse.InventoryFolderID;
197 198
diff --git a/OpenSim.sln b/OpenSim.sln
index 6788be5..76fd8ec 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"