ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-10-21 07:33:01 +01:00
parent 8853c21763 1f7577b735
commit fc33d569cd
31 changed files with 581 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -115,8 +115,20 @@ namespace OpenSim.Services.Interfaces
/// </summary>
public string ServerURI
{
get { return m_serverURI; }
set { m_serverURI = value; }
get {
if ( m_serverURI != string.Empty ) {
return m_serverURI;
} else {
return "http://" + m_externalHostName + ":" + m_httpPort + "/";
}
}
set {
if ( value.EndsWith("/") ) {
m_serverURI = value;
} else {
m_serverURI = value + '/';
}
}
}
protected string m_serverURI;
@@ -164,6 +176,7 @@ namespace OpenSim.Services.Interfaces
public GridRegion()
{
m_serverURI = string.Empty;
}
public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)