From 710b8375a98cf4dd96342eabc2eaaccc2fbd46f2 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 5 Oct 2007 11:40:30 +0000
Subject: Some tiny refactoring
---
OpenSim/Region/Application/OpenSimMain.cs | 9 ++++-----
OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 3 ++-
OpenSim/Region/Communications/Local/LocalLoginService.cs | 1 +
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
protected ModuleLoader m_moduleLoader;
+ protected LocalLoginService m_loginService;
protected string m_storageDLL = "OpenSim.DataStore.NullStorage.dll";
@@ -170,12 +171,10 @@ namespace OpenSim
CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, inventoryService, backendService, backendService);
m_commsManager = localComms;
+ m_loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate);
+ m_loginService.OnLoginToRegion += backendService.AddNewSession;
- LocalLoginService loginService = new LocalLoginService(userService, standaloneWelcomeMessage, localComms, m_networkServersInfo, standaloneAuthenticate);
- loginService.OnLoginToRegion += backendService.AddNewSession;
-
- m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
-
+ m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
if (standaloneAuthenticate)
{
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;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
namespace OpenSim.Region.Communications.Local
{
public class CommunicationsLocal : CommunicationsManager
{
- public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalUserServices userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
+ public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
: base(serversInfo, httpServer, assetCache)
{
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
response.SimPort = (Int32)reg.ExternalEndPoint.Port;
response.RegionX = reg.RegionLocX;
response.RegionY = reg.RegionLocY;
+
response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
// response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
--
cgit v1.1