aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-24 20:22:58 +0000
committerJustin Clarke Casey2008-03-24 20:22:58 +0000
commit6489746a6b302855a294e2d72ade169f0e8ca3ec (patch)
tree48a679e813ea007da789376abfd9f698afc58659
parentImplements llGetInventoryName() - the order is based upon inventory key, whic... (diff)
downloadopensim-SC_OLD-6489746a6b302855a294e2d72ade169f0e8ca3ec.zip
opensim-SC_OLD-6489746a6b302855a294e2d72ade169f0e8ca3ec.tar.gz
opensim-SC_OLD-6489746a6b302855a294e2d72ade169f0e8ca3ec.tar.bz2
opensim-SC_OLD-6489746a6b302855a294e2d72ade169f0e8ca3ec.tar.xz
* 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 :)
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs9
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs3
2 files changed, 11 insertions, 1 deletions
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
446 return m_commsManager.AddUser(tempfirstname,templastname,tempPasswd,regX,regY); 446 return m_commsManager.AddUser(tempfirstname,templastname,tempPasswd,regX,regY);
447 } 447 }
448 448
449 /// <summary>
450 /// Execute the region creation process. This includes setting up scene infrastructure.
451 /// </summary>
452 /// <param name="regionInfo"></param>
453 /// <param name="portadd_flag"></param>
454 /// <returns></returns>
449 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) 455 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
450 { 456 {
451 int port = regionInfo.InternalEndPoint.Port; 457 int port = regionInfo.InternalEndPoint.Port;
@@ -456,6 +462,9 @@ namespace OpenSim
456 // set initial ServerURI 462 // set initial ServerURI
457 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName 463 regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
458 + ":" + regionInfo.InternalEndPoint.Port.ToString(); 464 + ":" + regionInfo.InternalEndPoint.Port.ToString();
465
466 regionInfo.HttpPort = m_httpServerPort;
467 m_log.DebugFormat("[OPENSIM MAIN]: Setting http port for region {0} to {1}", regionInfo.InternalEndPoint, regionInfo.HttpPort);
459 468
460 if ((proxyUrl.Length > 0) && (portadd_flag)) 469 if ((proxyUrl.Length > 0) && (portadd_flag))
461 { 470 {
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
42{ 42{
43 public abstract class RegionApplicationBase : BaseOpenSimServer 43 public abstract class RegionApplicationBase : BaseOpenSimServer
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly log4net.ILog m_log
46 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
46 47
47 protected AssetCache m_assetCache; 48 protected AssetCache m_assetCache;
48 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>(); 49 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();