aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs10
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 96bb7b3..191cdf2 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -51,4 +51,4 @@ namespace OpenSim.Framework.Communications
51 /// <returns></returns> 51 /// <returns></returns>
52 List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID); 52 List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
53 } 53 }
54} \ No newline at end of file 54}
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index e86eaac..1f64187 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -74,14 +74,20 @@ namespace OpenSim.Framework.Communications
74 } 74 }
75 } 75 }
76 } 76 }
77 77
78 public List<InventoryFolderBase> RequestFirstLevelFolders(Guid rawUserID)
79 {
80 LLUUID userID = new LLUUID(rawUserID);
81 return RequestFirstLevelFolders(userID);
82 }
83
78 /// <summary> 84 /// <summary>
79 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree) 85 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
80 /// </summary> 86 /// </summary>
81 /// <param name="userID"></param> 87 /// <param name="userID"></param>
82 /// <returns></returns> 88 /// <returns></returns>
83 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) 89 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
84 { 90 {
85 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); 91 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
86 InventoryFolderBase rootFolder = null; 92 InventoryFolderBase rootFolder = null;
87 93