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

Inventory should be working again in sandbox mode

zircon^2
MW 2007-05-13 13:10:15 +00:00
parent 98705e6211
commit 5917d36219
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim.Framework/AgentInventory.cs
View File

@ -101,6 +101,19 @@ namespace OpenSim.Framework.Inventory
return false; 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) public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
{ {
if(this.InventoryItems.ContainsKey(itemID)) if(this.InventoryItems.ContainsKey(itemID))

2
OpenSim.Servers/LoginResponse.cs
View File

@ -183,6 +183,8 @@ namespace OpenSim.UserServer
this.SecureSessionID = LLUUID.Random(); this.SecureSessionID = LLUUID.Random();
this.userProfile.Inventory.CreateRootFolder(this.userProfile.UUID, true); 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(); Hashtable InventoryRootHash = new Hashtable();
InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated(); InventoryRootHash["folder_id"] = this.userProfile.Inventory.InventoryRoot.FolderID.ToStringHyphenated();
this.inventoryRoot.Add(InventoryRootHash); this.inventoryRoot.Add(InventoryRootHash);

1
OpenSim.Servers/LoginServer.cs
View File

@ -192,6 +192,7 @@ namespace OpenSim.UserServer
_login.Agent = loginResponse.AgentID; _login.Agent = loginResponse.AgentID;
_login.Session = loginResponse.SessionID; _login.Session = loginResponse.SessionID;
_login.SecureSession = loginResponse.SecureSessionID; _login.SecureSession = loginResponse.SecureSessionID;
_login.BaseFolder = loginResponse.BaseFolderID; _login.BaseFolder = loginResponse.BaseFolderID;
_login.InventoryFolder = loginResponse.InventoryFolderID; _login.InventoryFolder = loginResponse.InventoryFolderID;

2
OpenSim.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"