From a2167b0f0dfef5f8aeb7bee99f34f672f6004bb3 Mon Sep 17 00:00:00 2001
From: Jonathan Freedman
Date: Mon, 11 Oct 2010 16:53:00 -0400
Subject: * more url / hg cleanup
---
OpenSim/Framework/Capabilities/CapsUtil.cs | 2 +-
OpenSim/Framework/RegionInfo.cs | 31 +++++++++++++++++++++++++++---
2 files changed, 29 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs
index 0334e4b..faf2708 100644
--- a/OpenSim/Framework/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Capabilities/CapsUtil.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Capabilities
///
public static string GetCapsSeedPath(string capsObjectPath)
{
- return "/CAPS/" + capsObjectPath + "0000/";
+ return "CAPS/" + capsObjectPath + "0000/";
}
///
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 949a289..73b8bd0 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -115,7 +115,13 @@ namespace OpenSim.Framework
///
public string ServerURI
{
- get { return m_serverURI; }
+ get {
+ if ( m_serverURI != string.Empty ) {
+ return m_serverURI;
+ } else {
+ return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+ }
+ }
set {
if ( value.EndsWith("/") ) {
m_serverURI = value;
@@ -147,6 +153,7 @@ namespace OpenSim.Framework
public SimpleRegionInfo()
{
+ m_serverURI = string.Empty;
}
public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -156,6 +163,7 @@ namespace OpenSim.Framework
m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri;
+ m_serverURI = string.Empty;
}
public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
@@ -166,6 +174,7 @@ namespace OpenSim.Framework
m_externalHostName = externalUri;
m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
+ m_serverURI = string.Empty;
}
public SimpleRegionInfo(RegionInfo ConvertFrom)
@@ -455,6 +464,7 @@ namespace OpenSim.Framework
configMember =
new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
configMember.performConfigurationRetrieve();
+ m_serverURI = string.Empty;
}
public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -464,10 +474,12 @@ namespace OpenSim.Framework
m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri;
+ m_serverURI = string.Empty;
}
public RegionInfo()
{
+ m_serverURI = string.Empty;
}
public EstateSettings EstateSettings
@@ -557,10 +569,23 @@ namespace OpenSim.Framework
///
/// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
///
+
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 + '/';
+ }
+ }
}
public string RegionName
--
cgit v1.1