OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: eliminate method in UserProfileCacheService

0.6.0-stable
Justin Clarke Casey 2008-04-11 16:13:33 +00:00
parent b3892096f3
commit 9a7717743b
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -77,16 +77,25 @@ namespace OpenSim.Framework.Communications.Cache
} }
} }
} }
} }
public void UpdateUserInventory(LLUUID userID) /// <summary>
/// Request the inventory data for the given user. This will occur asynchronous if running on a grid
/// </summary>
/// <param name="userID"></param>
/// <param name="userInfo"></param>
public void RequestInventoryForUser(LLUUID userID)
{ {
CachedUserInfo userInfo = GetUserDetails(userID); CachedUserInfo userInfo = GetUserDetails(userID);
if (userInfo != null) if (userInfo != null)
{ {
RequestInventoryForUser(userID, userInfo); m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
} }
} else
{
m_log.ErrorFormat("[USER CACHE]: RequestInventoryForUser() - user profile for user {0} not found", userID);
}
}
public CachedUserInfo GetUserDetails(LLUUID userID) public CachedUserInfo GetUserDetails(LLUUID userID)
{ {
@ -408,15 +417,5 @@ namespace OpenSim.Framework.Communications.Cache
} }
} }
} }
/// <summary>
/// Request the inventory data for the given user.
/// </summary>
/// <param name="userID"></param>
/// <param name="userInfo"></param>
private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
{
m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
}
} }
} }

2
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim
public delegate void ConsoleCommand(string[] comParams); public delegate void ConsoleCommand(string[] comParams);
public class OpenSimMain : RegionApplicationBase, conscmd_callback public class OpenSimMain : RegionApplicationBase, conscmd_callback
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private string proxyUrl; private string proxyUrl;
private int proxyOffset = 0; private int proxyOffset = 0;

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
m_physicsActor.Flying = isFlying; m_physicsActor.Flying = isFlying;
m_scene.SwapRootAgentCount(false); m_scene.SwapRootAgentCount(false);
m_scene.CommsManager.UserProfileCacheService.UpdateUserInventory(m_uuid); m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);
m_scene.AddCapsHandler(m_uuid); m_scene.AddCapsHandler(m_uuid);
//if (!m_gotAllObjectsInScene) //if (!m_gotAllObjectsInScene)
//{ //{