diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local/CommunicationsLocal.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index a0bbf6d..3ad33f4 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -37,23 +37,25 @@ namespace OpenSim.Region.Communications.Local | |||
37 | { | 37 | { |
38 | public class CommunicationsLocal : CommunicationsManager | 38 | public class CommunicationsLocal : CommunicationsManager |
39 | { | 39 | { |
40 | public LocalBackEndServices SandBoxServices = new LocalBackEndServices(); | 40 | public LocalBackEndServices InstanceServices = new LocalBackEndServices(); |
41 | public LocalUserServices UserServices; | 41 | public LocalUserServices UserServices; |
42 | public LocalLoginService LoginServices; | ||
42 | 43 | ||
43 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) | 44 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) |
44 | : base(serversInfo, httpServer, assetCache) | 45 | : base(serversInfo, httpServer, assetCache) |
45 | { | 46 | { |
46 | UserServices = new LocalUserServices(this, serversInfo, accountsAuthenticate, welcomeMessage); | 47 | UserServices = new LocalUserServices(this, serversInfo); |
47 | UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); | 48 | UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); |
48 | UserServer = UserServices; | 49 | UserServer = UserServices; |
49 | GridServer = SandBoxServices; | 50 | GridServer = InstanceServices; |
50 | InterRegion = SandBoxServices; | 51 | InterRegion = InstanceServices; |
51 | httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod); | 52 | LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate); |
53 | httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); | ||
52 | } | 54 | } |
53 | 55 | ||
54 | internal void InformRegionOfLogin(ulong regionHandle, Login login) | 56 | internal void InformRegionOfLogin(ulong regionHandle, Login login) |
55 | { | 57 | { |
56 | this.SandBoxServices.AddNewSession(regionHandle, login); | 58 | this.InstanceServices.AddNewSession(regionHandle, login); |
57 | } | 59 | } |
58 | 60 | ||
59 | public void doCreate(string what) | 61 | public void doCreate(string what) |