aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2008-02-05 13:02:03 +0000
committerMW2008-02-05 13:02:03 +0000
commit33c4631c6d1912fb4e5af65ece7a2aa80c8b0005 (patch)
tree7cdabf3047e454b5235d4e67da5e722e025f9524 /OpenSim
parent* Fix Mantis 457 (diff)
downloadopensim-SC-33c4631c6d1912fb4e5af65ece7a2aa80c8b0005.zip
opensim-SC-33c4631c6d1912fb4e5af65ece7a2aa80c8b0005.tar.gz
opensim-SC-33c4631c6d1912fb4e5af65ece7a2aa80c8b0005.tar.bz2
opensim-SC-33c4631c6d1912fb4e5af65ece7a2aa80c8b0005.tar.xz
some small changes, like adding a couple of extra methods to IInventoryServices so that a check can be done to see if a inventory set exists for a certain user.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs14
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs10
4 files changed, 36 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index f2e5cc5..15a2f02 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Framework.Communications
44 void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); 44 void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
45 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); 45 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
46 void CreateNewUserInventory(LLUUID user); 46 void CreateNewUserInventory(LLUUID user);
47 bool HasInventoryForUser(LLUUID userID);
48 InventoryFolderBase RequestRootFolder(LLUUID userID);
47 49
48 /// <summary> 50 /// <summary>
49 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree) 51 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 2f466a3..a48988d 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -194,6 +194,16 @@ namespace OpenSim.Framework.Communications
194 } 194 }
195 } 195 }
196 196
197 public virtual bool HasInventoryForUser(LLUUID userID)
198 {
199 return false;
200 }
201
202 public InventoryFolderBase RequestRootFolder(LLUUID userID)
203 {
204 return RequestUsersRoot(userID);
205 }
206
197 /// <summary> 207 /// <summary>
198 /// 208 ///
199 /// </summary> 209 /// </summary>
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 730c40f..da4e473 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -83,6 +83,20 @@ namespace OpenSim.Region.Communications.Local
83 DeleteItem(item); 83 DeleteItem(item);
84 } 84 }
85 85
86 public override bool HasInventoryForUser(LLUUID userID)
87 {
88 InventoryFolderBase root = RequestUsersRoot(userID);
89 if (root == null)
90 {
91 return false;
92 }
93 else
94 {
95 return true;
96 }
97 }
98
99
86 /// <summary> 100 /// <summary>
87 /// Send the given inventory folder and its item contents back to the requester. 101 /// Send the given inventory folder and its item contents back to the requester.
88 /// </summary> 102 /// </summary>
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 0d97074..1780707 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -163,6 +163,16 @@ namespace OpenSim.Region.Communications.OGS1
163 "POST", _inventoryServerUrl + "/DeleteItem/", item); 163 "POST", _inventoryServerUrl + "/DeleteItem/", item);
164 } 164 }
165 165
166 public bool HasInventoryForUser(LLUUID userID)
167 {
168 return false;
169 }
170
171 public InventoryFolderBase RequestRootFolder(LLUUID userID)
172 {
173 return null;
174 }
175
166 public void CreateNewUserInventory(LLUUID user) 176 public void CreateNewUserInventory(LLUUID user)
167 { 177 {
168 } 178 }