aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-09-24 07:30:30 +0000
committerlbsa712007-09-24 07:30:30 +0000
commit1302ef44e3c632159378bc4042c753bcf36e9c63 (patch)
tree6b6295ac233ecb05afe6432a903ec616e4fa079a /OpenSim
parent* Trying to streamline CommunicationsManager (diff)
downloadopensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.zip
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.gz
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.bz2
opensim-SC_OLD-1302ef44e3c632159378bc4042c753bcf36e9c63.tar.xz
* Started major restructusing of comms to prepare for better grid and region functionality
* Working towards one shared set of services * Killed off two projects with very little functionality
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs (renamed from OpenSim/Framework/UserManager/CAPSService.cs)0
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs6
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs61
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs8
-rw-r--r--OpenSim/Framework/Communications/IUserServices.cs5
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs (renamed from OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs)11
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs (renamed from OpenSim/Framework/UserManager/LoginResponse.cs)0
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs (renamed from OpenSim/Framework/UserManager/LoginService.cs)0
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs (renamed from OpenSim/Framework/UserManager/UserManagerBase.cs)6
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs10
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs38
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs139
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs90
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs14
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs18
22 files changed, 239 insertions, 202 deletions
diff --git a/OpenSim/Framework/UserManager/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index a8eac26..a8eac26 100644
--- a/OpenSim/Framework/UserManager/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 59a9e00..d0507d0 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Caches
316 { 316 {
317 //really need to fix this call, if lbsa71 saw this he would die. 317 //really need to fix this call, if lbsa71 saw this he would die.
318 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset); 318 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
319 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId); 319 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
320 if (userInfo != null) 320 if (userInfo != null)
321 { 321 {
322 InventoryItemBase item = new InventoryItemBase(); 322 InventoryItemBase item = new InventoryItemBase();
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index acdb6db..99dc45a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Caches
101 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) 101 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
102 { 102 {
103 this.ItemReceive(userID, itemInfo); 103 this.ItemReceive(userID, itemInfo);
104 this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); 104 this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
105 } 105 }
106 } 106 }
107 107
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Communications.Caches
109 { 109 {
110 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) 110 if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
111 { 111 {
112 this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); 112 this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
113 } 113 }
114 } 114 }
115 115
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.Communications.Caches
121 result = RootFolder.DeleteItem(item.inventoryID); 121 result = RootFolder.DeleteItem(item.inventoryID);
122 if (result) 122 if (result)
123 { 123 {
124 this.m_parentCommsManager.InventoryServer.DeleteInventoryItem(userID, item); 124 this.m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
125 } 125 }
126 } 126 }
127 return result; 127 return result;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 0c8c0f9..390b938 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Caches
106 InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); 106 InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
107 if (createdFolder != null) 107 if (createdFolder != null)
108 { 108 {
109 this.m_parent.InventoryServer.AddNewInventoryFolder(remoteClient.AgentId, createdFolder); 109 this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
110 } 110 }
111 } 111 }
112 else 112 else
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
181 /// <param name="userID"></param> 181 /// <param name="userID"></param>
182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) 182 private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
183 { 183 {
184 this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); 184 this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
185 } 185 }
186 186
187 /// <summary> 187 /// <summary>
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Caches
190 /// <param name="userID"></param> 190 /// <param name="userID"></param>
191 private UserProfileData RequestUserProfileForUser(LLUUID userID) 191 private UserProfileData RequestUserProfileForUser(LLUUID userID)
192 { 192 {
193 return this.m_parent.UserServer.GetUserProfile(userID); 193 return this.m_parent.UserService.GetUserProfile(userID);
194 } 194 }
195 195
196 /// <summary> 196 /// <summary>
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2a87306..6ea3c29 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -37,81 +37,74 @@ namespace OpenSim.Framework.Communications
37{ 37{
38 public class CommunicationsManager 38 public class CommunicationsManager
39 { 39 {
40 protected AssetCache m_assetCache; 40 protected IUserServices m_userService;
41 protected IGridServices m_gridServer; 41 public IUserServices UserService
42 protected IInterRegionCommunications m_interRegion;
43 protected IInventoryServices m_inventoryServer;
44 protected AssetTransactionManager m_transactionsManager;
45 protected UserProfileCache m_userProfiles;
46 protected IUserServices m_userServer;
47 protected NetworkServersInfo m_networkServersInfo;
48
49 public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
50 {
51 m_networkServersInfo = serversInfo;
52 m_assetCache = assetCache;
53 m_userProfiles = new UserProfileCache(this);
54 m_transactionsManager = new AssetTransactionManager(this);
55 }
56
57 public IUserServices UserServer
58 { 42 {
59 get { return m_userServer; } 43 get { return m_userService; }
60 set { m_userServer = value; }
61 } 44 }
62 45
63 public IGridServices GridServer 46 protected IGridServices m_gridService;
47 public IGridServices GridService
64 { 48 {
65 get { return m_gridServer; } 49 get { return m_gridService; }
66 } 50 }
67 51
68 public IInventoryServices InventoryServer 52 protected IInventoryServices m_inventoryService;
53 public IInventoryServices InventoryService
69 { 54 {
70 get { return m_inventoryServer; } 55 get { return m_inventoryService; }
71 set { m_inventoryServer = value; }
72 } 56 }
73 57
58 protected IInterRegionCommunications m_interRegion;
74 public IInterRegionCommunications InterRegion 59 public IInterRegionCommunications InterRegion
75 { 60 {
76 get { return m_interRegion; } 61 get { return m_interRegion; }
77 set { m_interRegion = value; }
78 } 62 }
79 63
80 public UserProfileCache UserProfiles 64 protected UserProfileCache m_userProfileCache;
65 public UserProfileCache UserProfileCache
81 { 66 {
82 get { return m_userProfiles; } 67 get { return m_userProfileCache; }
83 set { m_userProfiles = value; }
84 } 68 }
85 69
70 protected AssetTransactionManager m_transactionsManager;
86 public AssetTransactionManager TransactionsManager 71 public AssetTransactionManager TransactionsManager
87 { 72 {
88 get { return m_transactionsManager; } 73 get { return m_transactionsManager; }
89 set { m_transactionsManager = value; }
90 } 74 }
91 75
76 protected AssetCache m_assetCache;
92 public AssetCache AssetCache 77 public AssetCache AssetCache
93 { 78 {
94 get { return m_assetCache; } 79 get { return m_assetCache; }
95 set { m_assetCache = value; }
96 } 80 }
97 81
82 protected NetworkServersInfo m_networkServersInfo;
98 public NetworkServersInfo NetworkServersInfo 83 public NetworkServersInfo NetworkServersInfo
99 { 84 {
100 get { return m_networkServersInfo; } 85 get { return m_networkServersInfo; }
101 set { m_networkServersInfo = value; }
102 } 86 }
103 87
88 public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
89 {
90 m_networkServersInfo = serversInfo;
91 m_assetCache = assetCache;
92 m_userProfileCache = new UserProfileCache(this);
93 m_transactionsManager = new AssetTransactionManager(this);
94 }
95
96
104 #region Packet Handlers 97 #region Packet Handlers
105 98
106 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client) 99 public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
107 { 100 {
108 if (uuid == m_userProfiles.libraryRoot.agentID) 101 if (uuid == m_userProfileCache.libraryRoot.agentID)
109 { 102 {
110 remote_client.SendNameReply(uuid, "Mr", "OpenSim"); 103 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
111 } 104 }
112 else 105 else
113 { 106 {
114 UserProfileData profileData = m_userServer.GetUserProfile(uuid); 107 UserProfileData profileData = m_userService.GetUserProfile(uuid);
115 if (profileData != null) 108 if (profileData != null)
116 { 109 {
117 LLUUID profileId = profileData.UUID; 110 LLUUID profileId = profileData.UUID;
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index bd58756..80c2e64 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -17,5 +17,13 @@ namespace OpenSim.Framework.Communications
17 void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder); 17 void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
18 void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); 18 void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
19 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); 19 void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
20 void CreateNewUserInventory(LLUUID user);
21
22 /// <summary>
23 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
24 /// </summary>
25 /// <param name="userID"></param>
26 /// <returns></returns>
27 List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
20 } 28 }
21} 29}
diff --git a/OpenSim/Framework/Communications/IUserServices.cs b/OpenSim/Framework/Communications/IUserServices.cs
index c1bea48..13dd378 100644
--- a/OpenSim/Framework/Communications/IUserServices.cs
+++ b/OpenSim/Framework/Communications/IUserServices.cs
@@ -40,5 +40,10 @@ namespace OpenSim.Framework.Communications
40 UserProfileData SetupMasterUser(string firstName, string lastName); 40 UserProfileData SetupMasterUser(string firstName, string lastName);
41 UserProfileData SetupMasterUser(string firstName, string lastName, string password); 41 UserProfileData SetupMasterUser(string firstName, string lastName, string password);
42 42
43 /// <summary>
44 ///
45 /// </summary>
46 /// <param name="user"></param>
47 void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
43 } 48 }
44} 49}
diff --git a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index d76fac5..da7a0ce 100644
--- a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -2,12 +2,14 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Reflection; 3using System.Reflection;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Communications;
5using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
6using OpenSim.Framework.Data; 7using OpenSim.Framework.Data;
8using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
7 9
8namespace OpenSim.Framework.InventoryServiceBase 10namespace OpenSim.Framework.Communications
9{ 11{
10 public class InventoryServiceBase 12 public abstract class InventoryServiceBase : IInventoryServices
11 { 13 {
12 protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>(); 14 protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
13 //protected IAssetServer m_assetServer; 15 //protected IAssetServer m_assetServer;
@@ -200,5 +202,10 @@ namespace OpenSim.Framework.InventoryServiceBase
200 Folders.Add(folder.folderID, folder); 202 Folders.Add(folder.folderID, folder);
201 } 203 }
202 } 204 }
205
206 public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
207 public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
208 public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
209 public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
203 } 210 }
204} \ No newline at end of file 211} \ No newline at end of file
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index b5a4184..b5a4184 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
diff --git a/OpenSim/Framework/UserManager/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8e7cf80..8e7cf80 100644
--- a/OpenSim/Framework/UserManager/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 4a2870b..d1bbde1 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -33,6 +33,7 @@ using System.Reflection;
33using System.Security.Cryptography; 33using System.Security.Cryptography;
34using libsecondlife; 34using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Communications;
36using OpenSim.Framework.Configuration; 37using OpenSim.Framework.Configuration;
37using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 39using OpenSim.Framework.Data;
@@ -40,7 +41,7 @@ using OpenSim.Framework.Utilities;
40 41
41namespace OpenSim.Framework.UserManagement 42namespace OpenSim.Framework.UserManagement
42{ 43{
43 public abstract class UserManagerBase 44 public abstract class UserManagerBase : IUserServices
44 { 45 {
45 public UserConfig _config; 46 public UserConfig _config;
46 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); 47 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
@@ -372,6 +373,7 @@ namespace OpenSim.Framework.UserManagement
372 } 373 }
373 } 374 }
374 375
375 // Rest and XML-RPC methods. (have moved them to a sub class in the user server) 376 public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
377 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
376 } 378 }
377} 379}
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 20f3b95..1fbd421 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -159,5 +159,15 @@ namespace OpenSim.Grid.UserServer
159 return ProfileToXmlRPCResponse(userProfile); 159 return ProfileToXmlRPCResponse(userProfile);
160 } 160 }
161 #endregion 161 #endregion
162
163 public override UserProfileData SetupMasterUser(string firstName, string lastName)
164 {
165 throw new Exception("The method or operation is not implemented.");
166 }
167
168 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
169 {
170 throw new Exception("The method or operation is not implemented.");
171 }
162 } 172 }
163} 173}
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index f5253ba..48e1f3f 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack
112 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 112 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
113 113
114 //Master Avatar Setup 114 //Master Avatar Setup
115 UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); 115 UserProfileData masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
116 if (masterAvatar != null) 116 if (masterAvatar != null)
117 { 117 {
118 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 118 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 15167fb..ea972dc 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -26,25 +26,23 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using libsecondlife;
29using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
31using OpenSim.Framework.Types;
32using OpenSim.Framework.Servers;
33using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
34using OpenSim.Framework.Utilities;
35using OpenSim.Framework.Data; 33using OpenSim.Framework.Data;
36using OpenSim.Framework.UserManagement; 34using OpenSim.Framework.Servers;
37using libsecondlife; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities;
38 37
39namespace OpenSim.Region.Communications.Local 38namespace OpenSim.Region.Communications.Local
40{ 39{
41 public class CommunicationsLocal : CommunicationsManager 40 public class CommunicationsLocal : CommunicationsManager
42 { 41 {
43 public LocalBackEndServices InstanceServices; 42 public LocalBackEndServices InstanceServices;
44 public LocalUserServices UserServices; 43 public IUserServices UserServices;
45 public LocalLoginService LoginServices; 44 public LocalLoginService LoginServices;
46 public LocalInventoryService InvenServices; 45
47
48 protected LocalSettings m_settings; 46 protected LocalSettings m_settings;
49 47
50 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache) 48 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
@@ -58,21 +56,21 @@ namespace OpenSim.Region.Communications.Local
58 { 56 {
59 m_settings = settings; 57 m_settings = settings;
60 58
61 InvenServices = new LocalInventoryService(); 59 LocalInventoryService inventoryService = new LocalInventoryService();
62 InvenServices.AddPlugin(m_settings.InventoryPlugin); 60 inventoryService.AddPlugin(m_settings.InventoryPlugin);
63 m_inventoryServer = InvenServices;
64 61
65 UserServices = new LocalUserServices(this, serversInfo); 62 m_inventoryService = inventoryService;
66 UserServices.AddPlugin(m_settings.UserDatabasePlugin); 63
67 m_userServer = UserServices; 64 LocalUserServices userService = new LocalUserServices(this, serversInfo);
65 userService.AddPlugin(m_settings.UserDatabasePlugin);
66 UserServices = userService;
67 m_userService = UserServices;
68 68
69 InstanceServices = new LocalBackEndServices(); 69 InstanceServices = new LocalBackEndServices();
70 m_gridServer = InstanceServices; 70 m_gridService = InstanceServices;
71 m_interRegion = InstanceServices; 71 m_interRegion = InstanceServices;
72 72
73 //CapsServices = new CAPSService(httpServer); 73 LoginServices = new LocalLoginService(userService, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
74
75 LoginServices = new LocalLoginService(UserServices, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
76 httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); 74 httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod);
77 } 75 }
78 76
@@ -121,14 +119,14 @@ namespace OpenSim.Region.Communications.Local
121 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + ""); 119 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + "");
122 120
123 this.UserServices.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY); 121 this.UserServices.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
124 UserProfileData userProf = this.UserServer.GetUserProfile(firstName, lastName); 122 UserProfileData userProf = this.UserService.GetUserProfile(firstName, lastName);
125 if (userProf == null) 123 if (userProf == null)
126 { 124 {
127 return LLUUID.Zero; 125 return LLUUID.Zero;
128 } 126 }
129 else 127 else
130 { 128 {
131 this.InvenServices.CreateNewUserInventory(userProf.UUID); 129 this.m_inventoryService.CreateNewUserInventory(userProf.UUID);
132 Console.WriteLine("Created new inventory set for " + firstName + " " + lastName); 130 Console.WriteLine("Created new inventory set for " + firstName + " " + lastName);
133 return userProf.UUID; 131 return userProf.UUID;
134 } 132 }
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index b8f57f6..53f6ffa 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -1,72 +1,67 @@
1using System; 1using System.Collections.Generic;
2using System.Collections.Generic; 2using libsecondlife;
3using libsecondlife; 3using OpenSim.Framework.Communications;
4using OpenSim.Framework.Communications; 4using OpenSim.Framework.Data;
5using OpenSim.Framework.Data; 5using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
6using OpenSim.Framework.Types; 6
7using OpenSim.Framework.UserManagement; 7namespace OpenSim.Region.Communications.Local
8using OpenSim.Framework.Utilities; 8{
9using OpenSim.Framework.InventoryServiceBase; 9 public class LocalInventoryService : InventoryServiceBase
10using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; 10 {
11 11
12namespace OpenSim.Region.Communications.Local 12 public LocalInventoryService()
13{ 13 {
14 public class LocalInventoryService : InventoryServiceBase , IInventoryServices 14
15 { 15 }
16 16
17 public LocalInventoryService() 17 public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
18 { 18 {
19 19 List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID);
20 } 20 InventoryFolder rootFolder = null;
21 21
22 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) 22 //need to make sure we send root folder first
23 { 23 foreach (InventoryFolderBase folder in folders)
24 List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID); 24 {
25 InventoryFolder rootFolder = null; 25 if (folder.parentID == libsecondlife.LLUUID.Zero)
26 26 {
27 //need to make sure we send root folder first 27 InventoryFolder newfolder = new InventoryFolder(folder);
28 foreach (InventoryFolderBase folder in folders) 28 rootFolder = newfolder;
29 { 29 folderCallBack(userID, newfolder);
30 if (folder.parentID == libsecondlife.LLUUID.Zero) 30 }
31 { 31 }
32 InventoryFolder newfolder = new InventoryFolder(folder); 32
33 rootFolder = newfolder; 33 if (rootFolder != null)
34 folderCallBack(userID, newfolder); 34 {
35 } 35 foreach (InventoryFolderBase folder in folders)
36 } 36 {
37 37 if (folder.folderID != rootFolder.folderID)
38 if (rootFolder != null) 38 {
39 { 39 InventoryFolder newfolder = new InventoryFolder(folder);
40 foreach (InventoryFolderBase folder in folders) 40 folderCallBack(userID, newfolder);
41 { 41
42 if (folder.folderID != rootFolder.folderID) 42 List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID);
43 { 43 foreach (InventoryItemBase item in items)
44 InventoryFolder newfolder = new InventoryFolder(folder); 44 {
45 folderCallBack(userID, newfolder); 45 itemCallBack(userID, item);
46 46 }
47 List<InventoryItemBase> items = this.RequestFolderItems(newfolder.folderID); 47 }
48 foreach (InventoryItemBase item in items) 48 }
49 { 49 }
50 itemCallBack(userID, item); 50 }
51 } 51
52 } 52 public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
53 } 53 {
54 } 54 this.AddFolder(folder);
55 } 55 }
56 56
57 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) 57 public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
58 { 58 {
59 this.AddFolder(folder); 59 this.AddItem(item);
60 } 60 }
61 61
62 public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) 62 public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
63 { 63 {
64 this.AddItem(item); 64 this.deleteItem(item);
65 } 65 }
66 66 }
67 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) 67}
68 {
69 this.deleteItem(item);
70 }
71 }
72}
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 9c15742..ed1858d 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
49 profile = this.m_userManager.GetUserProfile(firstname, lastname); 49 profile = this.m_userManager.GetUserProfile(firstname, lastname);
50 if (profile != null) 50 if (profile != null)
51 { 51 {
52 m_Parent.InvenServices.CreateNewUserInventory(profile.UUID); 52 m_Parent.InventoryService.CreateNewUserInventory(profile.UUID);
53 } 53 }
54 54
55 return profile; 55 return profile;
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Communications.Local
80 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 80 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
81 { 81 {
82 ulong currentRegion = theUser.currentAgent.currentHandle; 82 ulong currentRegion = theUser.currentAgent.currentHandle;
83 RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion); 83 RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion);
84 84
85 if (reg != null) 85 if (reg != null)
86 { 86 {
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.Local
119 119
120 protected override InventoryData CreateInventoryData(LLUUID userID) 120 protected override InventoryData CreateInventoryData(LLUUID userID)
121 { 121 {
122 List<InventoryFolderBase> folders = this.m_Parent.InvenServices.RequestFirstLevelFolders(userID); 122 List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
123 if (folders.Count > 0) 123 if (folders.Count > 0)
124 { 124 {
125 LLUUID rootID = LLUUID.Zero; 125 LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index a7cefcb..3bc4301 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -6,7 +6,7 @@ using OpenSim.Framework.UserManagement;
6 6
7namespace OpenSim.Region.Communications.Local 7namespace OpenSim.Region.Communications.Local
8{ 8{
9 public class LocalUserServices : UserManagerBase, IUserServices 9 public class LocalUserServices : UserManagerBase
10 { 10 {
11 private readonly CommunicationsLocal m_parent; 11 private readonly CommunicationsLocal m_parent;
12 12
@@ -24,12 +24,12 @@ namespace OpenSim.Region.Communications.Local
24 m_defaultHomeY = m_serversInfo.DefaultHomeLocY; 24 m_defaultHomeY = m_serversInfo.DefaultHomeLocY;
25 } 25 }
26 26
27 public UserProfileData SetupMasterUser(string firstName, string lastName) 27 public override UserProfileData SetupMasterUser(string firstName, string lastName)
28 { 28 {
29 return SetupMasterUser(firstName, lastName, ""); 29 return SetupMasterUser(firstName, lastName, "");
30 } 30 }
31 31
32 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 32 public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
33 { 33 {
34 UserProfileData profile = GetUserProfile(firstName, lastName); 34 UserProfileData profile = GetUserProfile(firstName, lastName);
35 if (profile != null) 35 if (profile != null)
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Communications.Local
48 } 48 }
49 else 49 else
50 { 50 {
51 m_parent.InvenServices.CreateNewUserInventory(profile.UUID); 51 m_parent.InventoryService.CreateNewUserInventory(profile.UUID);
52 } 52 }
53 53
54 return profile; 54 return profile;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index ca9c34b..96f1933 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -11,11 +11,11 @@ namespace OpenSim.Region.Communications.OGS1
11 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache) 11 public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
12 { 12 {
13 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); 13 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
14 m_gridServer = gridInterComms; 14 m_gridService = gridInterComms;
15 m_interRegion = gridInterComms; 15 m_interRegion = gridInterComms;
16 16
17 m_inventoryServer = new OGS1InventoryService(); 17 m_inventoryService = new OGS1InventoryService();
18 m_userServer = new OGS1UserServices(this); 18 m_userService = new OGS1UserServices(this);
19 } 19 }
20 } 20 }
21} 21}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 1428639..d5dbc46 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -1,38 +1,52 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using libsecondlife; 3using libsecondlife;
4using OpenSim.Framework.Communications; 4using OpenSim.Framework.Communications;
5using OpenSim.Framework.Data; 5using OpenSim.Framework.Data;
6using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; 6using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
7 7
8namespace OpenSim.Region.Communications.OGS1 8namespace OpenSim.Region.Communications.OGS1
9{ 9{
10 public class OGS1InventoryService : IInventoryServices 10 public class OGS1InventoryService : IInventoryServices
11 { 11 {
12 12
13 public OGS1InventoryService() 13 public OGS1InventoryService()
14 { 14 {
15 15
16 } 16 }
17 17
18 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) 18 #region IInventoryServices Members
19 { 19
20 20 public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
21 } 21 {
22 22 throw new Exception("The method or operation is not implemented.");
23 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder) 23 }
24 { 24
25 25 public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
26 } 26 {
27 27 throw new Exception("The method or operation is not implemented.");
28 public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) 28 }
29 { 29
30 30 public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
31 } 31 {
32 32 throw new Exception("The method or operation is not implemented.");
33 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) 33 }
34 { 34
35 35 public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
36 } 36 {
37 } 37 throw new Exception("The method or operation is not implemented.");
38} 38 }
39
40 public void CreateNewUserInventory(LLUUID user)
41 {
42 throw new Exception("The method or operation is not implemented.");
43 }
44
45 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
46 {
47 throw new Exception("The method or operation is not implemented.");
48 }
49
50 #endregion
51 }
52}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 71b3752..d376d1c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -101,5 +101,10 @@ namespace OpenSim.Region.Communications.OGS1
101 UserProfileData profile = GetUserProfile(firstName, lastName); 101 UserProfileData profile = GetUserProfile(firstName, lastName);
102 return profile; 102 return profile;
103 } 103 }
104
105 public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
106 {
107 throw new Exception("The method or operation is not implemented.");
108 }
104 } 109 }
105} 110}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index a6e47f3..81c0b73 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
27 27
28 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) 28 public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
29 { 29 {
30 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 30 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
31 if (userInfo != null) 31 if (userInfo != null)
32 { 32 {
33 userInfo.AddItem(remoteClient.AgentId, item); 33 userInfo.AddItem(remoteClient.AgentId, item);
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Scenes
49 49
50 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data) 50 public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
51 { 51 {
52 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 52 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
53 if (userInfo != null) 53 if (userInfo != null)
54 { 54 {
55 if (userInfo.RootFolder != null) 55 if (userInfo.RootFolder != null)
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
89 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, 89 public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID,
90 LLUUID itemID) 90 LLUUID itemID)
91 { 91 {
92 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 92 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
93 if (userInfo != null) 93 if (userInfo != null)
94 { 94 {
95 if (userInfo.RootFolder != null) 95 if (userInfo.RootFolder != null)
@@ -154,7 +154,7 @@ namespace OpenSim.Region.Environment.Scenes
154 { 154 {
155 if (transActionID == LLUUID.Zero) 155 if (transActionID == LLUUID.Zero)
156 { 156 {
157 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 157 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
158 if (userInfo != null) 158 if (userInfo != null)
159 { 159 {
160 AssetBase asset = new AssetBase(); 160 AssetBase asset = new AssetBase();
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes
244 244
245 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) 245 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
246 { 246 {
247 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 247 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
248 LLUUID copyID = LLUUID.Random(); 248 LLUUID copyID = LLUUID.Random();
249 if (userInfo != null) 249 if (userInfo != null)
250 { 250 {
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Environment.Scenes
335 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID)) 335 if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID))
336 { 336 {
337 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString(); 337 string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString();
338 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 338 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
339 if (userInfo != null) 339 if (userInfo != null)
340 { 340 {
341 AssetBase asset = new AssetBase(); 341 AssetBase asset = new AssetBase();
@@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Scenes
391 391
392 public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) 392 public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
393 { 393 {
394 CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId); 394 CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
395 if (userInfo != null) 395 if (userInfo != null)
396 { 396 {
397 if (userInfo.RootFolder != null) 397 if (userInfo.RootFolder != null)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 90736f4..8fc477a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -649,7 +649,7 @@ namespace OpenSim.Region.Environment.Scenes
649 CreateAndAddScenePresence(client, child); 649 CreateAndAddScenePresence(client, child);
650 650
651 m_LandManager.sendParcelOverlay(client); 651 m_LandManager.sendParcelOverlay(client);
652 commsManager.UserProfiles.AddNewUser(client.AgentId); 652 commsManager.UserProfileCache.AddNewUser(client.AgentId);
653 commsManager.TransactionsManager.AddUser(client.AgentId); 653 commsManager.TransactionsManager.AddUser(client.AgentId);
654 } 654 }
655 655
@@ -697,10 +697,10 @@ namespace OpenSim.Region.Environment.Scenes
697 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); 697 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
698 698
699 client.OnCreateNewInventoryItem += CreateNewInventoryItem; 699 client.OnCreateNewInventoryItem += CreateNewInventoryItem;
700 client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; 700 client.OnCreateNewInventoryFolder += commsManager.UserProfileCache.HandleCreateInventoryFolder;
701 client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; 701 client.OnFetchInventoryDescendents += commsManager.UserProfileCache.HandleFecthInventoryDescendents;
702 client.OnRequestTaskInventory += RequestTaskInventory; 702 client.OnRequestTaskInventory += RequestTaskInventory;
703 client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory; 703 client.OnFetchInventory += commsManager.UserProfileCache.HandleFetchInventory;
704 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset; 704 client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset;
705 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest; 705 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest;
706 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; 706 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
@@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Scenes
796 avatar.Close(); 796 avatar.Close();
797 797
798 // Remove client agent from profile, so new logins will work 798 // Remove client agent from profile, so new logins will work
799 commsManager.UserServer.clearUserAgent(agentID); 799 commsManager.UserService.clearUserAgent(agentID);
800 800
801 return; 801 return;
802 } 802 }
@@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Scenes
927 /// </summary> 927 /// </summary>
928 public void RegisterRegionWithComms() 928 public void RegisterRegionWithComms()
929 { 929 {
930 regionCommsHost = commsManager.GridServer.RegisterRegion(m_regInfo); 930 regionCommsHost = commsManager.GridService.RegisterRegion(m_regInfo);
931 if (regionCommsHost != null) 931 if (regionCommsHost != null)
932 { 932 {
933 regionCommsHost.OnExpectUser += NewUserConnection; 933 regionCommsHost.OnExpectUser += NewUserConnection;
@@ -989,7 +989,7 @@ namespace OpenSim.Region.Environment.Scenes
989 /// </summary> 989 /// </summary>
990 public void InformClientOfNeighbours(IClientAPI remoteClient) 990 public void InformClientOfNeighbours(IClientAPI remoteClient)
991 { 991 {
992 List<RegionInfo> neighbours = commsManager.GridServer.RequestNeighbours(m_regInfo); 992 List<RegionInfo> neighbours = commsManager.GridService.RequestNeighbours(m_regInfo);
993 993
994 if (neighbours != null) 994 if (neighbours != null)
995 { 995 {
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Environment.Scenes
1014 /// <returns></returns> 1014 /// <returns></returns>
1015 public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle) 1015 public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
1016 { 1016 {
1017 return commsManager.GridServer.RequestNeighbourInfo(regionHandle); 1017 return commsManager.GridService.RequestNeighbourInfo(regionHandle);
1018 } 1018 }
1019 1019
1020 /// <summary> 1020 /// <summary>
@@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Environment.Scenes
1027 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) 1027 public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
1028 { 1028 {
1029 List<MapBlockData> mapBlocks; 1029 List<MapBlockData> mapBlocks;
1030 mapBlocks = commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); 1030 mapBlocks = commsManager.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
1031 remoteClient.SendMapBlock(mapBlocks); 1031 remoteClient.SendMapBlock(mapBlocks);
1032 } 1032 }
1033 1033
generated by cgit v1.1 at 2024-11-11 14:21:12 +0000