aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs27
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
3 files changed, 15 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index d94ff6c..873070a 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -77,16 +77,25 @@ namespace OpenSim.Framework.Communications.Cache
77 } 77 }
78 } 78 }
79 } 79 }
80 } 80 }
81 81
82 public void UpdateUserInventory(LLUUID userID) 82 /// <summary>
83 /// Request the inventory data for the given user. This will occur asynchronous if running on a grid
84 /// </summary>
85 /// <param name="userID"></param>
86 /// <param name="userInfo"></param>
87 public void RequestInventoryForUser(LLUUID userID)
83 { 88 {
84 CachedUserInfo userInfo = GetUserDetails(userID); 89 CachedUserInfo userInfo = GetUserDetails(userID);
85 if (userInfo != null) 90 if (userInfo != null)
91 {
92 m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
93 }
94 else
86 { 95 {
87 RequestInventoryForUser(userID, userInfo); 96 m_log.ErrorFormat("[USER CACHE]: RequestInventoryForUser() - user profile for user {0} not found", userID);
88 } 97 }
89 } 98 }
90 99
91 public CachedUserInfo GetUserDetails(LLUUID userID) 100 public CachedUserInfo GetUserDetails(LLUUID userID)
92 { 101 {
@@ -408,15 +417,5 @@ namespace OpenSim.Framework.Communications.Cache
408 } 417 }
409 } 418 }
410 } 419 }
411
412 /// <summary>
413 /// Request the inventory data for the given user.
414 /// </summary>
415 /// <param name="userID"></param>
416 /// <param name="userInfo"></param>
417 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
418 {
419 m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
420 }
421 } 420 }
422} 421}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 91a0f19..1167576 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -59,7 +59,7 @@ namespace OpenSim
59 public delegate void ConsoleCommand(string[] comParams); 59 public delegate void ConsoleCommand(string[] comParams);
60 60
61 public class OpenSimMain : RegionApplicationBase, conscmd_callback 61 public class OpenSimMain : RegionApplicationBase, conscmd_callback
62 { 62 {
63 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 63 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
64 private string proxyUrl; 64 private string proxyUrl;
65 private int proxyOffset = 0; 65 private int proxyOffset = 0;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 365c884..795224e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
550 m_physicsActor.Flying = isFlying; 550 m_physicsActor.Flying = isFlying;
551 551
552 m_scene.SwapRootAgentCount(false); 552 m_scene.SwapRootAgentCount(false);
553 m_scene.CommsManager.UserProfileCacheService.UpdateUserInventory(m_uuid); 553 m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);
554 m_scene.AddCapsHandler(m_uuid); 554 m_scene.AddCapsHandler(m_uuid);
555 //if (!m_gotAllObjectsInScene) 555 //if (!m_gotAllObjectsInScene)
556 //{ 556 //{