aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorlbsa712007-10-26 14:08:36 +0000
committerlbsa712007-10-26 14:08:36 +0000
commit070047ce1bc74cceebd5e817a0e042a7390c5f24 (patch)
tree074326d9e948655f5b2c0c378d601d611e1d4f4d /OpenSim/Region/Communications/Local
parentRegion ground texture was not marked as temporary, when being created, and as... (diff)
downloadopensim-SC_OLD-070047ce1bc74cceebd5e817a0e042a7390c5f24.zip
opensim-SC_OLD-070047ce1bc74cceebd5e817a0e042a7390c5f24.tar.gz
opensim-SC_OLD-070047ce1bc74cceebd5e817a0e042a7390c5f24.tar.bz2
opensim-SC_OLD-070047ce1bc74cceebd5e817a0e042a7390c5f24.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs11
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs10
2 files changed, 14 insertions, 7 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 }