ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Diva Canto
2009-08-11 10:51:49 -07:00
parent 263f32a493 2dbdb7e036
commit dc897b2288
17 changed files with 496 additions and 152 deletions
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)
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");