From 070047ce1bc74cceebd5e817a0e042a7390c5f24 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 26 Oct 2007 14:08:36 +0000
Subject: * Added prototypical AvatarFactory module interface to load avatar
parameters * Added dump_assets_to_file option to enable asset dumping for
debug * normalized some namespaces * InventoryFolder renamed to
InventoryFolderImpl to
---
.../Communications/Cache/UserProfileCache.cs | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 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 362ab17..bd7aeef 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
-namespace OpenSim.Framework.Communications.Caches
+namespace OpenSim.Framework.Communications.Cache
{
public class UserProfileCache
{
@@ -107,15 +107,15 @@ namespace OpenSim.Framework.Communications.Caches
CachedUserInfo info = this.UserProfiles[remoteClient.AgentId];
if (info.RootFolder.folderID == parentID)
{
- InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
- if (createdFolder != null)
- {
- this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
- }
+ InventoryFolderImpl createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
+ if (createdFolder != null)
+ {
+ this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
+ }
}
else
{
- InventoryFolder folder = info.RootFolder.HasSubFolder(parentID);
+ InventoryFolderImpl folder = info.RootFolder.HasSubFolder(parentID);
if (folder != null)
{
folder.CreateNewSubFolder(folderID, folderName, folderType);
@@ -127,7 +127,7 @@ namespace OpenSim.Framework.Communications.Caches
public void HandleFecthInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
{
- InventoryFolder fold = null;
+ InventoryFolderImpl fold = null;
if (folderID == libraryRoot.folderID )
{
remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, libraryRoot.folderID, libraryRoot.RequestListOfItems());
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications.Caches
}
else
{
- InventoryFolder folder = info.RootFolder.HasSubFolder(folderID);
+ InventoryFolderImpl folder = info.RootFolder.HasSubFolder(folderID);
if ((folder != null) && fetchItems)
{
remoteClient.SendInventoryFolderDetails(remoteClient.AgentId, folderID, folder.RequestListOfItems());
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Communications.Caches
///
private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
{
- this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
+ this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
}
///
@@ -223,5 +223,4 @@ namespace OpenSim.Framework.Communications.Caches
{
}
}
-}
-
+}
\ No newline at end of file
--
cgit v1.1