OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.

arthursv
Diva Canto 2009-08-11 14:31:45 -07:00
parent dae9a111aa
commit bd7ff803fe
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -698,7 +698,7 @@ namespace OpenSim.Framework.Communications
if (rootfolder != null) if (rootfolder != null)
userProf.RootInventoryFolderID = rootfolder.ID; userProf.RootInventoryFolderID = rootfolder.ID;
} }
else else if (m_commsManager.InterServiceInventoryService != null)
{ {
// used by the user server // used by the user server
m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory"); m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");

2
OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
View File

@ -86,7 +86,7 @@ namespace OpenSim.Server.Handlers.Inventory
m_httpServer.AddStreamHandler( m_httpServer.AddStreamHandler(
new RestDeserialiseSecureHandler<Guid, Dictionary<AssetType, InventoryFolderBase>>( new RestDeserialiseSecureHandler<Guid, Dictionary<AssetType, InventoryFolderBase>>(
"GET", "/SystemFolders/", GetSystemFolders, CheckAuthSession)); "POST", "/SystemFolders/", GetSystemFolders, CheckAuthSession));
m_httpServer.AddStreamHandler( m_httpServer.AddStreamHandler(
new RestDeserialiseSecureHandler<Guid, InventoryCollection>( new RestDeserialiseSecureHandler<Guid, InventoryCollection>(

4
OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
View File

@ -167,11 +167,11 @@ namespace OpenSim.Services.Connectors
//try //try
//{ //{
// return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject(
// "GET", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
//} //}
//catch (Exception e) //catch (Exception e)
//{ //{
// m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}", // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
// e.Source, e.Message); // e.Source, e.Message);
//} //}