aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-10-05 11:40:30 +0000
committerMW2007-10-05 11:40:30 +0000
commit710b8375a98cf4dd96342eabc2eaaccc2fbd46f2 (patch)
tree4d6777043904f2226b08917a4051760331aadd00
parent* UserProfileData meets code conventions (diff)
downloadopensim-SC_OLD-710b8375a98cf4dd96342eabc2eaaccc2fbd46f2.zip
opensim-SC_OLD-710b8375a98cf4dd96342eabc2eaaccc2fbd46f2.tar.gz
opensim-SC_OLD-710b8375a98cf4dd96342eabc2eaaccc2fbd46f2.tar.bz2
opensim-SC_OLD-710b8375a98cf4dd96342eabc2eaaccc2fbd46f2.tar.xz
Some tiny refactoring
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs9
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs3
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs1
3 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 637246e..eeb69c5 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -63,6 +63,7 @@ namespace OpenSim
63 63
64 64
65 protected ModuleLoader m_moduleLoader; 65 protected ModuleLoader m_moduleLoader;
66 protected LocalLoginService m_loginService;
66 67
67 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll"; 68 protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
68 69
@@ -170,12 +171,10 @@ namespace OpenSim
170 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService); 171 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService);
171 m_commsManager = localComms; 172 m_commsManager = localComms;
172 173
174 m_loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate);
175 m_loginService.OnLoginToRegion += backendService.AddNewSession;
173 176
174 LocalLoginService loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate); 177 m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
175 loginService.OnLoginToRegion += backendService.AddNewSession;
176
177 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
178
179 178
180 if (standaloneAuthenticate) 179 if (standaloneAuthenticate)
181 { 180 {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 7a00c5a..3bfcd8e 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -34,12 +34,13 @@ using OpenSim.Framework.Data;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Interfaces;
37 38
38namespace OpenSim.Region.Communications.Local 39namespace OpenSim.Region.Communications.Local
39{ 40{
40 public class CommunicationsLocal : CommunicationsManager 41 public class CommunicationsLocal : CommunicationsManager
41 { 42 {
42 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalUserServices userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService) 43 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
43 : base(serversInfo, httpServer, assetCache) 44 : base(serversInfo, httpServer, assetCache)
44 { 45 {
45 m_inventoryService = inventoryService; 46 m_inventoryService = inventoryService;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 23cab48..f2148ca 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -95,6 +95,7 @@ namespace OpenSim.Region.Communications.Local
95 response.SimPort = (Int32)reg.ExternalEndPoint.Port; 95 response.SimPort = (Int32)reg.ExternalEndPoint.Port;
96 response.RegionX = reg.RegionLocX; 96 response.RegionX = reg.RegionLocX;
97 response.RegionY = reg.RegionLocY; 97 response.RegionY = reg.RegionLocY;
98
98 99
99 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; 100 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
100 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; 101 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";