Merge branch 'master' into careminster-presence-refactor

1 files changed, 35 insertions, 4 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a006f3e..d57d4e9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -116,8 +116,20 @@ namespace OpenSim.Framework
         /// </summary>
         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 + '/';
+                }
+            }
         }
         protected string m_serverURI;
 
@@ -142,6 +154,7 @@ namespace OpenSim.Framework
 
         public SimpleRegionInfo()
         {
+            m_serverURI = string.Empty;
         }
 
         public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -151,6 +164,7 @@ namespace OpenSim.Framework
 
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
+            m_serverURI = string.Empty;
         }
 
         public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
@@ -161,6 +175,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)
@@ -450,6 +465,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)
@@ -459,10 +475,12 @@ namespace OpenSim.Framework
 
             m_internalEndPoint = internalEndPoint;
             m_externalHostName = externalUri;
+            m_serverURI = string.Empty;
         }
 
         public RegionInfo()
         {
+            m_serverURI = string.Empty;
         }
 
         public EstateSettings EstateSettings
@@ -552,10 +570,23 @@ namespace OpenSim.Framework
         /// <summary>
         /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
         /// </summary>
+        
         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