* 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 

1 files changed, 4 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index b1432ff..92b21a8 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -27,7 +27,6 @@
 */
 using libsecondlife;
 using OpenSim.Framework.Types;
-using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -35,7 +34,7 @@ namespace OpenSim.Framework.Communications.Cache
     {
         private readonly CommunicationsManager m_parentCommsManager;
         // Fields
-        public InventoryFolder RootFolder = null;
+        public InventoryFolderImpl RootFolder = null;
         public UserProfileData UserProfile = null;
 
         public CachedUserInfo(CommunicationsManager commsManager)
@@ -44,7 +43,7 @@ namespace OpenSim.Framework.Communications.Cache
         }
 
         // Methods
-        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
+        public void FolderReceive(LLUUID userID, InventoryFolderImpl folderInfo)
         {
             if (userID == this.UserProfile.UUID)
             {
@@ -61,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
                 else
                 {
-                    InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
+                    InventoryFolderImpl folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
                     if (folder != null)
                     {
                         folder.SubFolders.Add(folderInfo.folderID, folderInfo);
@@ -80,7 +79,7 @@ namespace OpenSim.Framework.Communications.Cache
                 }
                 else
                 {
-                    InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
+                    InventoryFolderImpl folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID);
                     if (folder != null)
                     {
                         folder.Items.Add(itemInfo.inventoryID, itemInfo);