aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs39
1 files changed, 4 insertions, 35 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d57d4e9..a006f3e 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -116,20 +116,8 @@ namespace OpenSim.Framework
116 /// </summary> 116 /// </summary>
117 public string ServerURI 117 public string ServerURI
118 { 118 {
119 get { 119 get { return m_serverURI; }
120 if ( m_serverURI != string.Empty ) { 120 set { m_serverURI = value; }
121 return m_serverURI;
122 } else {
123 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
124 }
125 }
126 set {
127 if ( value.EndsWith("/") ) {
128 m_serverURI = value;
129 } else {
130 m_serverURI = value + '/';
131 }
132 }
133 } 121 }
134 protected string m_serverURI; 122 protected string m_serverURI;
135 123
@@ -154,7 +142,6 @@ namespace OpenSim.Framework
154 142
155 public SimpleRegionInfo() 143 public SimpleRegionInfo()
156 { 144 {
157 m_serverURI = string.Empty;
158 } 145 }
159 146
160 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 147 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -164,7 +151,6 @@ namespace OpenSim.Framework
164 151
165 m_internalEndPoint = internalEndPoint; 152 m_internalEndPoint = internalEndPoint;
166 m_externalHostName = externalUri; 153 m_externalHostName = externalUri;
167 m_serverURI = string.Empty;
168 } 154 }
169 155
170 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) 156 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
@@ -175,7 +161,6 @@ namespace OpenSim.Framework
175 m_externalHostName = externalUri; 161 m_externalHostName = externalUri;
176 162
177 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); 163 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
178 m_serverURI = string.Empty;
179 } 164 }
180 165
181 public SimpleRegionInfo(RegionInfo ConvertFrom) 166 public SimpleRegionInfo(RegionInfo ConvertFrom)
@@ -465,7 +450,6 @@ namespace OpenSim.Framework
465 configMember = 450 configMember =
466 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); 451 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
467 configMember.performConfigurationRetrieve(); 452 configMember.performConfigurationRetrieve();
468 m_serverURI = string.Empty;
469 } 453 }
470 454
471 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 455 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -475,12 +459,10 @@ namespace OpenSim.Framework
475 459
476 m_internalEndPoint = internalEndPoint; 460 m_internalEndPoint = internalEndPoint;
477 m_externalHostName = externalUri; 461 m_externalHostName = externalUri;
478 m_serverURI = string.Empty;
479 } 462 }
480 463
481 public RegionInfo() 464 public RegionInfo()
482 { 465 {
483 m_serverURI = string.Empty;
484 } 466 }
485 467
486 public EstateSettings EstateSettings 468 public EstateSettings EstateSettings
@@ -570,23 +552,10 @@ namespace OpenSim.Framework
570 /// <summary> 552 /// <summary>
571 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) 553 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
572 /// </summary> 554 /// </summary>
573
574 public string ServerURI 555 public string ServerURI
575 { 556 {
576 get { 557 get { return m_serverURI; }
577 if ( m_serverURI != string.Empty ) { 558 set { m_serverURI = value; }
578 return m_serverURI;
579 } else {
580 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
581 }
582 }
583 set {
584 if ( value.EndsWith("/") ) {
585 m_serverURI = value;
586 } else {
587 m_serverURI = value + '/';
588 }
589 }
590 } 559 }
591 560
592 public string RegionName 561 public string RegionName