ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

* minor: replace test of CachedUserInfo.RootFolder != null with something more readable, and make RootFolder get only

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-04-11 17:02:20 +00:00
parent 205b95f2e8
commit e26d4fc085
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Communications.Cache
if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
if (userProfile.RootFolder.ID == parentID)
{
@@ -175,7 +175,7 @@ namespace OpenSim.Framework.Communications.Cache
if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
InventoryFolderBase baseFolder = new InventoryFolderBase();
baseFolder.Owner = remoteClient.AgentId;
@@ -195,7 +195,7 @@ namespace OpenSim.Framework.Communications.Cache
if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
InventoryFolderBase baseFolder = new InventoryFolderBase();
baseFolder.Owner = remoteClient.AgentId;
@@ -248,21 +248,21 @@ namespace OpenSim.Framework.Communications.Cache
// inventory failure.
//
// This is a crude way of dealing with that by retrying the lookup.
if (userProfile.RootFolder == null)
if (!userProfile.HasInventory)
{
int attempts = 5;
while (attempts-- > 0)
{
Thread.Sleep(3000);
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
break;
}
}
}
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
if (userProfile.RootFolder.ID == folderID)
{
@@ -346,7 +346,7 @@ namespace OpenSim.Framework.Communications.Cache
CachedUserInfo userProfile;
if (m_userProfiles.TryGetValue(agentID, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
if (userProfile.RootFolder.ID == folderID)
{
@@ -393,7 +393,7 @@ namespace OpenSim.Framework.Communications.Cache
CachedUserInfo userProfile;
if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
InventoryFolderImpl subFolder = userProfile.RootFolder.HasSubFolder(folderID);
if (subFolder != null)
@@ -420,7 +420,7 @@ namespace OpenSim.Framework.Communications.Cache
CachedUserInfo userProfile;
if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
{
if (userProfile.RootFolder != null)
if (userProfile.HasInventory)
{
InventoryItemBase item = userProfile.RootFolder.HasItem(itemID);
if (item != null)