From 6489746a6b302855a294e2d72ade169f0e8ca3ec Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 24 Mar 2008 20:22:58 +0000 Subject: * Make standalone non-home region caps work again. * When I removed the hard coding for the http port last night, I foolishly assumed standalone would be okay :) --- OpenSim/Region/Application/OpenSimMain.cs | 9 +++++++++ OpenSim/Region/ClientStack/RegionApplicationBase.cs | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 6510eea..e2902dc 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -446,6 +446,12 @@ namespace OpenSim return m_commsManager.AddUser(tempfirstname,templastname,tempPasswd,regX,regY); } + /// + /// Execute the region creation process. This includes setting up scene infrastructure. + /// + /// + /// + /// public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) { int port = regionInfo.InternalEndPoint.Port; @@ -456,6 +462,9 @@ namespace OpenSim // set initial ServerURI regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port.ToString(); + + regionInfo.HttpPort = m_httpServerPort; + m_log.DebugFormat("[OPENSIM MAIN]: Setting http port for region {0} to {1}", regionInfo.InternalEndPoint, regionInfo.HttpPort); if ((proxyUrl.Length > 0) && (portadd_flag)) { diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index b6f0f12..ed29e8e 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -42,7 +42,8 @@ namespace OpenSim.Region.ClientStack { public abstract class RegionApplicationBase : BaseOpenSimServer { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly log4net.ILog m_log + = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); protected AssetCache m_assetCache; protected Dictionary m_clientCircuits = new Dictionary(); -- cgit v1.1