aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer/GridInventoryService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-14 07:55:33 +0000
committerTeravus Ovares2007-12-14 07:55:33 +0000
commit79935881aa4ac16990625360b256aa5eebe12ce7 (patch)
tree2059842c03a6b7ae36692e530c18fb1d9956ba40 /OpenSim/Grid/InventoryServer/GridInventoryService.cs
parentAdded copyright notice. (diff)
downloadopensim-SC_OLD-79935881aa4ac16990625360b256aa5eebe12ce7.zip
opensim-SC_OLD-79935881aa4ac16990625360b256aa5eebe12ce7.tar.gz
opensim-SC_OLD-79935881aa4ac16990625360b256aa5eebe12ce7.tar.bz2
opensim-SC_OLD-79935881aa4ac16990625360b256aa5eebe12ce7.tar.xz
* Patch from Justincc that swaps out LLUUIDs for Guid on the inventory REST calls
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 797de91..c6d3302 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -72,8 +72,10 @@ namespace OpenSim.Grid.InventoryServer
72 } 72 }
73 } 73 }
74 74
75 public InventoryCollection GetUserInventory(LLUUID userID) 75 public InventoryCollection GetUserInventory(Guid rawUserID)
76 { 76 {
77 LLUUID userID = new LLUUID(rawUserID);
78
77 InventoryCollection invCollection = new InventoryCollection(); 79 InventoryCollection invCollection = new InventoryCollection();
78 List<InventoryFolderBase> folders; 80 List<InventoryFolderBase> folders;
79 List<InventoryItemBase> allItems; 81 List<InventoryItemBase> allItems;
@@ -86,10 +88,12 @@ namespace OpenSim.Grid.InventoryServer
86 return invCollection; 88 return invCollection;
87 } 89 }
88 90
89 public bool CreateUsersInventory(LLUUID user) 91 public bool CreateUsersInventory(Guid rawUserID)
90 { 92 {
91 Console.WriteLine("Creating New Set of Inventory Folders for " + user.ToStringHyphenated()); 93 LLUUID userID = new LLUUID(rawUserID);
92 CreateNewUserInventory(user); 94
95 Console.WriteLine("Creating New Set of Inventory Folders for " + userID.ToStringHyphenated());
96 CreateNewUserInventory(userID);
93 return true; 97 return true;
94 } 98 }
95 99