aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-08-10 11:48:30 -0700
committerDiva Canto2009-08-10 11:48:30 -0700
commit34d0f119cbb28839ba73f834fae99d501d771211 (patch)
tree66e57d1dfbd4013a1300633a648ca21bedba0300 /OpenSim
parentEt voila! - Old inventory code removed. (diff)
downloadopensim-SC_OLD-34d0f119cbb28839ba73f834fae99d501d771211.zip
opensim-SC_OLD-34d0f119cbb28839ba73f834fae99d501d771211.tar.gz
opensim-SC_OLD-34d0f119cbb28839ba73f834fae99d501d771211.tar.bz2
opensim-SC_OLD-34d0f119cbb28839ba73f834fae99d501d771211.tar.xz
Conditional to prevent a null ref in tests. The tests may still not pass.
Diffstat (limited to 'OpenSim')
-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 b9044eb..bd5d0e3 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");