From b167507e323a2f0162aa3106ab63d8cf2a5f57ae Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Fri, 30 Nov 2007 20:16:40 +0000
Subject: Patch for mantis 0000015: Textures don't display in the object
properties window
From Justin Casey (IBM)
---
.../Communications/Cache/UserProfileCache.cs | 23 +++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Framework/Communications/Cache/UserProfileCache.cs')
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 117ed36..379ac9d 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -111,6 +111,15 @@ namespace OpenSim.Framework.Communications.Cache
}
}
+ ///
+ /// Tell the client about the various child items and folders contained in the requested folder.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
public void HandleFecthInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID,
bool fetchFolders, bool fetchItems, int sortOrder)
{
@@ -118,14 +127,14 @@ namespace OpenSim.Framework.Communications.Cache
if (folderID == libraryRoot.folderID)
{
remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, libraryRoot.folderID,
- libraryRoot.RequestListOfItems());
+ libraryRoot.RequestListOfItems(), libraryRoot.SubFoldersCount);
return;
}
if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
{
- remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems());
+ remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems(), fold.SubFoldersCount);
return;
}
@@ -140,16 +149,16 @@ namespace OpenSim.Framework.Communications.Cache
if (fetchItems)
{
remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID,
- userProfile.RootFolder.RequestListOfItems());
+ userProfile.RootFolder.RequestListOfItems(), userProfile.RootFolder.SubFoldersCount);
}
}
else
{
InventoryFolderImpl folder = userProfile.RootFolder.HasSubFolder(folderID);
- if ((folder != null) && fetchItems)
+
+ if (fetchItems && folder != null)
{
- remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID,
- folder.RequestListOfItems());
+ remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, folder.RequestListOfItems(), folder.SubFoldersCount);
}
}
}
@@ -184,4 +193,4 @@ namespace OpenSim.Framework.Communications.Cache
m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1