* 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 :)0.6.0-stable
parent
3be815b206
commit
6489746a6b
|
@ -446,6 +446,12 @@ namespace OpenSim
|
||||||
return m_commsManager.AddUser(tempfirstname,templastname,tempPasswd,regX,regY);
|
return m_commsManager.AddUser(tempfirstname,templastname,tempPasswd,regX,regY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Execute the region creation process. This includes setting up scene infrastructure.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="regionInfo"></param>
|
||||||
|
/// <param name="portadd_flag"></param>
|
||||||
|
/// <returns></returns>
|
||||||
public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
|
public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
|
||||||
{
|
{
|
||||||
int port = regionInfo.InternalEndPoint.Port;
|
int port = regionInfo.InternalEndPoint.Port;
|
||||||
|
@ -457,6 +463,9 @@ namespace OpenSim
|
||||||
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
|
regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName
|
||||||
+ ":" + regionInfo.InternalEndPoint.Port.ToString();
|
+ ":" + 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))
|
if ((proxyUrl.Length > 0) && (portadd_flag))
|
||||||
{
|
{
|
||||||
// set proxy url to RegionInfo
|
// set proxy url to RegionInfo
|
||||||
|
|
|
@ -42,7 +42,8 @@ namespace OpenSim.Region.ClientStack
|
||||||
{
|
{
|
||||||
public abstract class RegionApplicationBase : BaseOpenSimServer
|
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 AssetCache m_assetCache;
|
||||||
protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
|
protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
|
||||||
|
|
Loading…
Reference in New Issue