aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
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/UserServer
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/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs12
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 90fcac3..4806e52 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Grid.UserServer
129 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); 129 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
130 130
131 LLUUID userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 131 LLUUID userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
132 RestObjectPoster.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "CreateInventory/", userID); 132 RestObjectPoster.BeginPostObject<Guid>(m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
133 m_lastCreatedUser = userID; 133 m_lastCreatedUser = userID;
134 break; 134 break;
135 } 135 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index fa5eac5..02db6d0 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -198,8 +198,8 @@ namespace OpenSim.Grid.UserServer
198 protected override InventoryData CreateInventoryData(LLUUID userID) 198 protected override InventoryData CreateInventoryData(LLUUID userID)
199 { 199 {
200 List<InventoryFolderBase> folders 200 List<InventoryFolderBase> folders
201 = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( 201 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
202 "POST", m_config.InventoryUrl + "RootFolders/", userID); 202 "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
203 203
204 // In theory, the user will only ever be missing a root folder in situations where a grid 204 // In theory, the user will only ever be missing a root folder in situations where a grid
205 // which didn't previously run a grid wide inventory server is being transitioned to one 205 // which didn't previously run a grid wide inventory server is being transitioned to one
@@ -211,15 +211,15 @@ namespace OpenSim.Grid.UserServer
211 "A root inventory folder for user ID " + userID + " was not found. A new set" 211 "A root inventory folder for user ID " + userID + " was not found. A new set"
212 + " of empty inventory folders is being created."); 212 + " of empty inventory folders is being created.");
213 213
214 RestObjectPoster.BeginPostObject<LLUUID>( 214 RestObjectPoster.BeginPostObject<Guid>(
215 m_config.InventoryUrl + "CreateInventory/", userID); 215 m_config.InventoryUrl + "CreateInventory/", userID.UUID);
216 216
217 // A big delay should be okay here since the recreation of the user's root folders should 217 // A big delay should be okay here since the recreation of the user's root folders should
218 // only ever happen once. We need to sleep to let the inventory server do its work - 218 // only ever happen once. We need to sleep to let the inventory server do its work -
219 // previously 1000ms has been found to be too short. 219 // previously 1000ms has been found to be too short.
220 Thread.Sleep(10000); 220 Thread.Sleep(10000);
221 folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( 221 folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
222 "POST", m_config.InventoryUrl + "RootFolders/", userID); 222 "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
223 } 223 }
224 224
225 if (folders.Count > 0) 225 if (folders.Count > 0)