ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Start passing around a region server's http port in RegionInfo.

Browse Source 
* This means that caps methods (editing scripts, poss map functions, etc) on non-home regions should now work with servers which are listening for http ports on a non default 
(9000) port.  
* If you are running a region server, this may only work properly once your grid server upgrades to this revision
* PLEASE NOTE: This shouldn't cause inter-region problems if one end of the connection hasn't upgraded to this revision.  However if it does, the instability will persist until 
the grid and region (and possibly all the region's neighbours) have upgraded to this revision.
* This revision also adds extra login related messages, both for success and failure conditions
This commit is contained in:
Justin Clarke Casey
2008-03-23 21:21:39 +00:00
parent 68d016517d
commit da531fa9e1
10 changed files with 107 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/RegionInfo.cs
View File

@@ -71,6 +71,7 @@ namespace OpenSim.Framework
m_internalEndPoint = ConvertFrom.InternalEndPoint;
m_externalHostName = ConvertFrom.ExternalHostName;
m_remotingPort = ConvertFrom.RemotingPort;
m_httpPort = ConvertFrom.HttpPort;
m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
RemotingAddress = ConvertFrom.RemotingAddress;
RegionID = LLUUID.Zero;
@@ -79,16 +80,27 @@ namespace OpenSim.Framework
public LLUUID RegionID = LLUUID.Zero;
public uint m_remotingPort;
protected uint m_remotingPort;
public uint RemotingPort
{
get { return m_remotingPort; }
set { m_remotingPort = value; }
}
/// <value>
/// The port by which http communication occurs with the region (most noticeably, CAPS communication)
/// </value>
protected uint m_httpPort;
public uint HttpPort
{
get { return m_httpPort; }
set { m_httpPort = value; }
}
public bool m_allow_alternate_ports;
public string m_serverURI;
protected string m_serverURI;
public string ServerURI
{
get
@@ -142,7 +154,6 @@ namespace OpenSim.Framework
}
protected string m_externalHostName;
public string ExternalHostName
{
get { return m_externalHostName; }