aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-03-29 17:04:24 +0000
committerMW2007-03-29 17:04:24 +0000
commitf673b73471dd450881006a5281c15b4b70c96b2d (patch)
treebfefbf0ef295d9a8685818c8f4c3d1fd94aa831f /OpenSim.Framework
parent* vs2005 target gens OpenSim.csporj.user with -loginserver -sandbox -accounts... (diff)
downloadopensim-SC_OLD-f673b73471dd450881006a5281c15b4b70c96b2d.zip
opensim-SC_OLD-f673b73471dd450881006a5281c15b4b70c96b2d.tar.gz
opensim-SC_OLD-f673b73471dd450881006a5281c15b4b70c96b2d.tar.bz2
opensim-SC_OLD-f673b73471dd450881006a5281c15b4b70c96b2d.tar.xz
Fixed so Inventory structure is correct after a log out and re-login (in Sandbox accounts)
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r--OpenSim.Framework/AgentInventory.cs3
-rw-r--r--OpenSim.Framework/UserProfileManager.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index 1abf59a..8032455 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Inventory
33 33
34 InventoryRoot = new InventoryFolder(); 34 InventoryRoot = new InventoryFolder();
35 InventoryRoot.FolderID = LLUUID.Random(); 35 InventoryRoot.FolderID = LLUUID.Random();
36 InventoryRoot.ParentID = new LLUUID(); 36 InventoryRoot.ParentID = LLUUID.Zero;
37 InventoryRoot.Version = 1; 37 InventoryRoot.Version = 1;
38 InventoryRoot.DefaultType = 8; 38 InventoryRoot.DefaultType = 8;
39 InventoryRoot.OwnerID = this.AgentID; 39 InventoryRoot.OwnerID = this.AgentID;
@@ -84,6 +84,7 @@ namespace OpenSim.Framework.Inventory
84 84
85 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent) 85 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parent)
86 { 86 {
87 Console.WriteLine("creating new folder called " + folderName + " in agents inventory");
87 InventoryFolder Folder = new InventoryFolder(); 88 InventoryFolder Folder = new InventoryFolder();
88 Folder.FolderID = folderID; 89 Folder.FolderID = folderID;
89 Folder.OwnerID = this.AgentID; 90 Folder.OwnerID = this.AgentID;
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index ef5ab71..2f99494 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -287,9 +287,11 @@ namespace OpenSim.Framework.User
287 ClassifiedCategories.Add(ClassifiedCategoriesHash); 287 ClassifiedCategories.Add(ClassifiedCategoriesHash);
288 288
289 ArrayList AgentInventory = new ArrayList(); 289 ArrayList AgentInventory = new ArrayList();
290 Console.WriteLine("adding inventory to response");
290 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) 291 foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
291 { 292 {
292 Hashtable TempHash = new Hashtable(); 293 Hashtable TempHash = new Hashtable();
294 Console.WriteLine("adding folder " + InvFolder.FolderName + ", ID: " + InvFolder.FolderID.ToStringHyphenated() + " with parent: " + InvFolder.ParentID.ToStringHyphenated());
293 TempHash["name"] = InvFolder.FolderName; 295 TempHash["name"] = InvFolder.FolderName;
294 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 296 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
295 TempHash["version"] = (Int32)InvFolder.Version; 297 TempHash["version"] = (Int32)InvFolder.Version;