aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/UserManagerBase.cs
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/Framework/Communications/UserManagerBase.cs
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/Framework/Communications/UserManagerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
1 files changed, 1 insertions, 1 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");