aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Capabilities/CapsUtil.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs31
2 files changed, 4 insertions, 29 deletions
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index faf2708..0334e4b 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Capabilities
41 /// <returns></returns> 41 /// <returns></returns>
42 public static string GetCapsSeedPath(string capsObjectPath) 42 public static string GetCapsSeedPath(string capsObjectPath)
43 { 43 {
44 return "CAPS/" + capsObjectPath + "0000/"; 44 return "/CAPS/" + capsObjectPath + "0000/";
45 } 45 }
46 46
47 /// <summary> 47 /// <summary>
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 73b8bd0..949a289 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -115,13 +115,7 @@ namespace OpenSim.Framework
115 /// </summary> 115 /// </summary>
116 public string ServerURI 116 public string ServerURI
117 { 117 {
118 get { 118 get { return m_serverURI; }
119 if ( m_serverURI != string.Empty ) {
120 return m_serverURI;
121 } else {
122 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
123 }
124 }
125 set { 119 set {
126 if ( value.EndsWith("/") ) { 120 if ( value.EndsWith("/") ) {
127 m_serverURI = value; 121 m_serverURI = value;
@@ -153,7 +147,6 @@ namespace OpenSim.Framework
153 147
154 public SimpleRegionInfo() 148 public SimpleRegionInfo()
155 { 149 {
156 m_serverURI = string.Empty;
157 } 150 }
158 151
159 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 152 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -163,7 +156,6 @@ namespace OpenSim.Framework
163 156
164 m_internalEndPoint = internalEndPoint; 157 m_internalEndPoint = internalEndPoint;
165 m_externalHostName = externalUri; 158 m_externalHostName = externalUri;
166 m_serverURI = string.Empty;
167 } 159 }
168 160
169 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) 161 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
@@ -174,7 +166,6 @@ namespace OpenSim.Framework
174 m_externalHostName = externalUri; 166 m_externalHostName = externalUri;
175 167
176 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); 168 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
177 m_serverURI = string.Empty;
178 } 169 }
179 170
180 public SimpleRegionInfo(RegionInfo ConvertFrom) 171 public SimpleRegionInfo(RegionInfo ConvertFrom)
@@ -464,7 +455,6 @@ namespace OpenSim.Framework
464 configMember = 455 configMember =
465 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); 456 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
466 configMember.performConfigurationRetrieve(); 457 configMember.performConfigurationRetrieve();
467 m_serverURI = string.Empty;
468 } 458 }
469 459
470 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 460 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -474,12 +464,10 @@ namespace OpenSim.Framework
474 464
475 m_internalEndPoint = internalEndPoint; 465 m_internalEndPoint = internalEndPoint;
476 m_externalHostName = externalUri; 466 m_externalHostName = externalUri;
477 m_serverURI = string.Empty;
478 } 467 }
479 468
480 public RegionInfo() 469 public RegionInfo()
481 { 470 {
482 m_serverURI = string.Empty;
483 } 471 }
484 472
485 public EstateSettings EstateSettings 473 public EstateSettings EstateSettings
@@ -569,23 +557,10 @@ namespace OpenSim.Framework
569 /// <summary> 557 /// <summary>
570 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) 558 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
571 /// </summary> 559 /// </summary>
572
573 public string ServerURI 560 public string ServerURI
574 { 561 {
575 get { 562 get { return m_serverURI; }
576 if ( m_serverURI != string.Empty ) { 563 set { m_serverURI = value; }
577 return m_serverURI;
578 } else {
579 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
580 }
581 }
582 set {
583 if ( value.EndsWith("/") ) {
584 m_serverURI = value;
585 } else {
586 m_serverURI = value + '/';
587 }
588 }
589 } 564 }
590 565
591 public string RegionName 566 public string RegionName