Revert "Merge remote branch 'otakup0pe/mantis5110'"

This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
This commit is contained in:
Justin Clark-Casey (justincc)
2010-10-22 23:52:07 +01:00
parent 21187f459e
commit fe8d3d5a2b
25 changed files with 193 additions and 214 deletions

View File

@@ -115,20 +115,8 @@ namespace OpenSim.Services.Interfaces
/// </summary>
public string ServerURI
{
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 + '/';
}
}
get { return m_serverURI; }
set { m_serverURI = value; }
}
protected string m_serverURI;
@@ -176,7 +164,6 @@ namespace OpenSim.Services.Interfaces
public GridRegion()
{
m_serverURI = string.Empty;
}
public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)