aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs11
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs10
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs4
4 files changed, 17 insertions, 10 deletions
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
35{ 35{
36 public class CommunicationsLocal : CommunicationsManager 36 public class CommunicationsLocal : CommunicationsManager
37 { 37 {
38 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService) 38 public CommunicationsLocal(
39 : base(serversInfo, httpServer, assetCache) 39 NetworkServersInfo serversInfo,
40 BaseHttpServer httpServer,
41 AssetCache assetCache,
42 IUserService userService,
43 LocalInventoryService inventoryService,
44 IInterRegionCommunications interRegionService,
45 IGridServices gridService, bool dumpAssetsToFile )
46 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
40 { 47 {
41 m_inventoryService = inventoryService; 48 m_inventoryService = inventoryService;
42 m_userService = userService; 49 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 @@
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
33using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
34 34
35namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
36{ 36{
@@ -45,14 +45,14 @@ namespace OpenSim.Region.Communications.Local
45 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) 45 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
46 { 46 {
47 List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); 47 List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID);
48 InventoryFolder rootFolder = null; 48 InventoryFolderImpl rootFolder = null;
49 49
50 //need to make sure we send root folder first 50 //need to make sure we send root folder first
51 foreach (InventoryFolderBase folder in folders) 51 foreach (InventoryFolderBase folder in folders)
52 { 52 {
53 if (folder.parentID == libsecondlife.LLUUID.Zero) 53 if (folder.parentID == libsecondlife.LLUUID.Zero)
54 { 54 {
55 InventoryFolder newfolder = new InventoryFolder(folder); 55 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
56 rootFolder = newfolder; 56 rootFolder = newfolder;
57 folderCallBack(userID, newfolder); 57 folderCallBack(userID, newfolder);
58 } 58 }
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Communications.Local
64 { 64 {
65 if (folder.folderID != rootFolder.folderID) 65 if (folder.folderID != rootFolder.folderID)
66 { 66 {
67 InventoryFolder newfolder = new InventoryFolder(folder); 67 InventoryFolderImpl newfolder = new InventoryFolderImpl(folder);
68 folderCallBack(userID, newfolder); 68 folderCallBack(userID, newfolder);
69 69
70 List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); 70 List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID);
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Communications.Local
77 } 77 }
78 } 78 }
79 79
80 public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) 80 public override void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
81 { 81 {
82 this.AddFolder(folder); 82 this.AddFolder(folder);
83 } 83 }
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
36{ 36{
37 public class CommunicationsOGS1 : CommunicationsManager 37 public class CommunicationsOGS1 : CommunicationsManager
38 { 38 {
39 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) 39 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache, false)
40 { 40 {
41 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); 41 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
42 m_gridService = gridInterComms; 42 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 @@
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
33using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
34 34
35 35
36namespace OpenSim.Region.Communications.OGS1 36namespace OpenSim.Region.Communications.OGS1
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
50 50
51 } 51 }
52 52
53 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) 53 public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
54 { 54 {
55 55
56 } 56 }