Merged with origin, and resolved one conflict in LoginServiceTests.cs

author: Diva Canto 2009-08-11 10:51:49 -0700
committer: Diva Canto 2009-08-11 10:51:49 -0700
commit: dc897b228826c5e5c9db62e13fd9cb6872ff15b6 (patch)
tree: da499f946125f00291e23c72c468a2bff579551c /OpenSim/Framework/Communications/UserManagerBase.cs
parent: Improved test for system folders. Removed log messages. (diff)
parent: Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on th... (diff)
download: opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.zip
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.gz
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.bz2
opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 58174a0..7ad6bbf 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Framework.Communications
                    if (rootfolder != null)
                        userProf.RootInventoryFolderID = rootfolder.ID;
                }
-                else if (m_commsManager.InterServiceInventoryService != null)
+                else
                {
                    // used by the user server
                    m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");
author	Diva Canto	2009-08-11 10:51:49 -0700
committer	Diva Canto	2009-08-11 10:51:49 -0700
commit	dc897b228826c5e5c9db62e13fd9cb6872ff15b6 (patch)
tree	da499f946125f00291e23c72c468a2bff579551c /OpenSim/Framework/Communications/UserManagerBase.cs
parent	Improved test for system folders. Removed log messages. (diff)
parent	Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on th... (diff)
download	opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.zip opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.gz opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.bz2 opensim-SC_OLD-dc897b228826c5e5c9db62e13fd9cb6872ff15b6.tar.xz

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 58174a0..7ad6bbf 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 if (m_commsManager.InterServiceInventoryService != null)	701	else
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");