aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-10 15:28:52 +0000
committerJustin Clarke Casey2008-04-10 15:28:52 +0000
commitba132f3a0bbbc2f749bec9c563e169d22c76f74b (patch)
tree10f2f5622e09c41a7096e85addedf36251fc52a7 /OpenSim
parent* Slightly smoother transition between land, shallow water and deep water in ... (diff)
downloadopensim-SC-ba132f3a0bbbc2f749bec9c563e169d22c76f74b.zip
opensim-SC-ba132f3a0bbbc2f749bec9c563e169d22c76f74b.tar.gz
opensim-SC-ba132f3a0bbbc2f749bec9c563e169d22c76f74b.tar.bz2
opensim-SC-ba132f3a0bbbc2f749bec9c563e169d22c76f74b.tar.xz
* Minor: get CreateNewUserInventory() to return true on success
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs5
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs3
3 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index eaa2350..966ab75 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -66,10 +66,11 @@ namespace OpenSim.Framework.Communications
66 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); 66 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
67 67
68 /// <summary> 68 /// <summary>
69 /// Create a new inventory for the given user 69 /// Create a new inventory for the given user.
70 /// </summary> 70 /// </summary>
71 /// <param name="user"></param> 71 /// <param name="user"></param>
72 void CreateNewUserInventory(LLUUID user); 72 /// <returns>true if the inventory was successfully created, false otherwise</returns>
73 bool CreateNewUserInventory(LLUUID user);
73 74
74 bool HasInventoryForUser(LLUUID userID); 75 bool HasInventoryForUser(LLUUID userID);
75 76
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 0d19932..f9a47b1 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Framework.Communications
135 } 135 }
136 136
137 // See IInventoryServices 137 // See IInventoryServices
138 public void CreateNewUserInventory(LLUUID user) 138 public bool CreateNewUserInventory(LLUUID user)
139 { 139 {
140 InventoryFolderBase existingRootFolder = RequestRootFolder(user); 140 InventoryFolderBase existingRootFolder = RequestRootFolder(user);
141 141
@@ -151,7 +151,11 @@ namespace OpenSim.Framework.Communications
151 UsersInventory inven = new UsersInventory(); 151 UsersInventory inven = new UsersInventory();
152 inven.CreateNewInventorySet(user); 152 inven.CreateNewInventorySet(user);
153 AddNewInventorySet(inven); 153 AddNewInventorySet(inven);
154
155 return true;
154 } 156 }
157
158 return false;
155 } 159 }
156 160
157 public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, 161 public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 3a13f71..b18c5bf 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -208,8 +208,9 @@ namespace OpenSim.Region.Communications.OGS1
208 return null; 208 return null;
209 } 209 }
210 210
211 public void CreateNewUserInventory(LLUUID user) 211 public bool CreateNewUserInventory(LLUUID user)
212 { 212 {
213 return false;
213 } 214 }
214 215
215 // See IInventoryServices 216 // See IInventoryServices