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

---
 OpenSim/Region/Communications/Local/CommunicationsLocal.cs   | 11 +++++++++--
 OpenSim/Region/Communications/Local/LocalInventoryService.cs | 10 +++++-----
 OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs     |  2 +-
 OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs   |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Communications')

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index e57e445..13af96c 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -35,8 +35,15 @@ namespace OpenSim.Region.Communications.Local
 {
     public class CommunicationsLocal : CommunicationsManager
     {
-        public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
-            : base(serversInfo, httpServer, assetCache)
+        public CommunicationsLocal(
+            NetworkServersInfo serversInfo, 
+            BaseHttpServer httpServer, 
+            AssetCache assetCache, 
+            IUserService userService, 
+            LocalInventoryService inventoryService, 
+            IInterRegionCommunications interRegionService, 
+            IGridServices gridService, bool dumpAssetsToFile )
+            : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
         {
             m_inventoryService = inventoryService;
             m_userService = userService;
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 5d450bb..fd6002a 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -29,8 +29,8 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
-using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -45,14 +45,14 @@ namespace OpenSim.Region.Communications.Local
         public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
         {
             List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID);
-            InventoryFolder rootFolder = null;
+            InventoryFolderImpl rootFolder = null;
 
             //need to make sure we send root folder first
             foreach (InventoryFolderBase folder in folders)
             {
                 if (folder.parentID == libsecondlife.LLUUID.Zero)
                 {
-                    InventoryFolder newfolder = new InventoryFolder(folder);
+                    InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
                     rootFolder = newfolder;
                     folderCallBack(userID, newfolder);
                 }
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Communications.Local
                 {
                     if (folder.folderID != rootFolder.folderID)
                     {
-                        InventoryFolder newfolder = new InventoryFolder(folder);
+                        InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
                         folderCallBack(userID, newfolder);
 
                         List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID);
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
+        public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
         {
             this.AddFolder(folder);
         }
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 8ebeeca..4be31d8 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class CommunicationsOGS1 : CommunicationsManager
     {
-        public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
+        public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache, false)
         {
             OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
             m_gridService = gridInterComms;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 77713af..d8f5a22 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,8 +29,8 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
-using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 
 namespace OpenSim.Region.Communications.OGS1
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
             
         }
 
-        public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
+        public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
         {
             
         }
-- 
cgit v1.1