aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-11 16:53:00 -0400
committerTeravus Ovares (Dan Olivares)2010-10-20 22:21:45 -0400
commit58f75fa19d9aea18283ecdbd44559efb81781c9d (patch)
treee8bfce52ff388d7e6f02fd48b406280d139bbf29 /OpenSim/Services/Interfaces
parent* additional serveruri cleanup (diff)
downloadopensim-SC_OLD-58f75fa19d9aea18283ecdbd44559efb81781c9d.zip
opensim-SC_OLD-58f75fa19d9aea18283ecdbd44559efb81781c9d.tar.gz
opensim-SC_OLD-58f75fa19d9aea18283ecdbd44559efb81781c9d.tar.bz2
opensim-SC_OLD-58f75fa19d9aea18283ecdbd44559efb81781c9d.tar.xz
* more url / hg cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index bf441e6..6d3bff7 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -115,7 +115,13 @@ namespace OpenSim.Services.Interfaces
115 /// </summary> 115 /// </summary>
116 public string ServerURI 116 public string ServerURI
117 { 117 {
118 get { return m_serverURI; } 118 get {
119 if ( m_serverURI != string.Empty ) {
120 return m_serverURI;
121 } else {
122 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
123 }
124 }
119 set { 125 set {
120 if ( value.EndsWith("/") ) { 126 if ( value.EndsWith("/") ) {
121 m_serverURI = value; 127 m_serverURI = value;
@@ -170,6 +176,7 @@ namespace OpenSim.Services.Interfaces
170 176
171 public GridRegion() 177 public GridRegion()
172 { 178 {
179 m_serverURI = string.Empty;
173 } 180 }
174 181
175 public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) 182 public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri)