diff options
author | Justin Clarke Casey | 2009-02-12 17:07:44 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-12 17:07:44 +0000 |
commit | 31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302 (patch) | |
tree | 89a086e5dcdc1cb026b9a9fe2d9d914babaa65a0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | * Added XEngine tests and gathered other ScriptEngine (diff) | |
download | opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.zip opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.gz opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.bz2 opensim-SC_OLD-31ca3a8d4d53fc82a3b4cb62ad4edaebc4111302.tar.xz |
* refactor: Move RequestInventoryForUser() from service to CachedUserInfo
* This simplifies callers in most cases - CachedUserInfo is already handling the rest of the fetch inventory work anyway
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0ed35af..2dd305a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -847,7 +847,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
847 | //SendAnimPack(); | 847 | //SendAnimPack(); |
848 | 848 | ||
849 | m_scene.SwapRootAgentCount(false); | 849 | m_scene.SwapRootAgentCount(false); |
850 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); | 850 | |
851 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); | ||
852 | if (userInfo != null) | ||
853 | userInfo.FetchInventory(); | ||
854 | else | ||
855 | m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); | ||
856 | |||
851 | //m_scene.CapsModule.AddCapsHandler(m_uuid); | 857 | //m_scene.CapsModule.AddCapsHandler(m_uuid); |
852 | 858 | ||
853 | // On the next prim update, all objects will be sent | 859 | // On the next prim update, all objects will be sent |
@@ -2504,8 +2510,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2504 | } | 2510 | } |
2505 | else | 2511 | else |
2506 | { | 2512 | { |
2507 | // Restore the user structures that we needed to delete before asking the receiving region to complete the crossing | 2513 | // Restore the user structures that we needed to delete before asking the receiving region |
2508 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(UUID); | 2514 | // to complete the crossing |
2515 | userInfo.FetchInventory(); | ||
2509 | m_scene.CapsModule.AddCapsHandler(UUID); | 2516 | m_scene.CapsModule.AddCapsHandler(UUID); |
2510 | } | 2517 | } |
2511 | } | 2518 | } |