aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 14:31:45 -0700
committerDiva Canto2009-08-11 14:31:45 -0700
commitbd7ff803fe189ffd730599350429d9b9d41582be (patch)
tree6f6d69c66a5a97e34d820764713b9a3132d64b02 /OpenSim
parentAdded new operations to mock inventory service in tests. (diff)
downloadopensim-SC_OLD-bd7ff803fe189ffd730599350429d9b9d41582be.zip
opensim-SC_OLD-bd7ff803fe189ffd730599350429d9b9d41582be.tar.gz
opensim-SC_OLD-bd7ff803fe189ffd730599350429d9b9d41582be.tar.bz2
opensim-SC_OLD-bd7ff803fe189ffd730599350429d9b9d41582be.tar.xz
Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs4
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 7ad6bbf..58174a0 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Framework.Communications
698 if (rootfolder != null) 698 if (rootfolder != null)
699 userProf.RootInventoryFolderID = rootfolder.ID; 699 userProf.RootInventoryFolderID = rootfolder.ID;
700 } 700 }
701 else 701 else if (m_commsManager.InterServiceInventoryService != null)
702 { 702 {
703 // used by the user server 703 // used by the user server
704 m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory"); 704 m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index c74c431..ae9546a 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Server.Handlers.Inventory
86 86
87 m_httpServer.AddStreamHandler( 87 m_httpServer.AddStreamHandler(
88 new RestDeserialiseSecureHandler<Guid, Dictionary<AssetType, InventoryFolderBase>>( 88 new RestDeserialiseSecureHandler<Guid, Dictionary<AssetType, InventoryFolderBase>>(
89 "GET", "/SystemFolders/", GetSystemFolders, CheckAuthSession)); 89 "POST", "/SystemFolders/", GetSystemFolders, CheckAuthSession));
90 90
91 m_httpServer.AddStreamHandler( 91 m_httpServer.AddStreamHandler(
92 new RestDeserialiseSecureHandler<Guid, InventoryCollection>( 92 new RestDeserialiseSecureHandler<Guid, InventoryCollection>(
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 5efcf3a..5fb4815 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -167,11 +167,11 @@ namespace OpenSim.Services.Connectors
167 //try 167 //try
168 //{ 168 //{
169 // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( 169 // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject(
170 // "GET", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); 170 // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
171 //} 171 //}
172 //catch (Exception e) 172 //catch (Exception e)
173 //{ 173 //{
174 // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}", 174 // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
175 // e.Source, e.Message); 175 // e.Source, e.Message);
176 //} 176 //}
177 177