diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
| commit | 2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3 (patch) | |
| tree | b8a0cc747dd73da553d8d3504d3c842d9283be73 /OpenSim/Framework/Communications/UserManagerBase.cs | |
| parent | Try something to help the tests complete. (diff) | |
| parent | Fixes a race condition in EQ processing that was making EQs pop up again upon... (diff) | |
| download | opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.zip opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.gz opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.bz2 opensim-SC-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index b9044eb..58174a0 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
| @@ -694,11 +694,11 @@ namespace OpenSim.Framework.Communications | |||
| 694 | // local service (standalone) | 694 | // local service (standalone) |
| 695 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); | 695 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); |
| 696 | m_InventoryService.CreateUserInventory(userProf.ID); | 696 | m_InventoryService.CreateUserInventory(userProf.ID); |
| 697 | InventoryFolderBase rootfolder = m_InventoryService.RequestRootFolder(userProf.ID); | 697 | InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID); |
| 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"); |