ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Justincc that swaps out LLUUIDs for Guid on the inventory REST calls

Browse Source
This commit is contained in:
Teravus Ovares
2007-12-14 07:55:33 +00:00
parent c65b2a38d8
commit 79935881aa
7 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@@ -198,8 +198,8 @@ namespace OpenSim.Grid.UserServer
protected override InventoryData CreateInventoryData(LLUUID userID)
{
List<InventoryFolderBase> folders
= SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
"POST", m_config.InventoryUrl + "RootFolders/", userID);
= SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
"POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
// In theory, the user will only ever be missing a root folder in situations where a grid
// which didn't previously run a grid wide inventory server is being transitioned to one
@@ -211,15 +211,15 @@ namespace OpenSim.Grid.UserServer
"A root inventory folder for user ID " + userID + " was not found. A new set"
+ " of empty inventory folders is being created.");
RestObjectPoster.BeginPostObject<LLUUID>(
m_config.InventoryUrl + "CreateInventory/", userID);
RestObjectPoster.BeginPostObject<Guid>(
m_config.InventoryUrl + "CreateInventory/", userID.UUID);
// A big delay should be okay here since the recreation of the user's root folders should
// only ever happen once. We need to sleep to let the inventory server do its work -
// previously 1000ms has been found to be too short.
Thread.Sleep(10000);
folders = SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
"POST", m_config.InventoryUrl + "RootFolders/", userID);
folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
"POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
}
if (folders.Count > 0)