aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2013-09-01 22:49:31 +0100
committerMelanie2013-09-01 22:49:31 +0100
commit008c98a9748ba7deadb80c435ddd372002b6c844 (patch)
tree9458b87c1d28d741ee6c2384eb1028375cb703ab /OpenSim/Services/Interfaces
parentMerge branch 'master' into careminster (diff)
parentProfiles: Clean up some log entries caused when visiting HG avatar is using l... (diff)
downloadopensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.zip
opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.gz
opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.bz2
opensim-SC_OLD-008c98a9748ba7deadb80c435ddd372002b6c844.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958..cecbe9e 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -137,7 +137,10 @@ namespace OpenSim.Services.Interfaces
137 if ( m_serverURI != string.Empty ) { 137 if ( m_serverURI != string.Empty ) {
138 return m_serverURI; 138 return m_serverURI;
139 } else { 139 } else {
140 return "http://" + m_externalHostName + ":" + m_httpPort + "/"; 140 if (m_httpPort == 0)
141 return "http://" + m_externalHostName + "/";
142 else
143 return "http://" + m_externalHostName + ":" + m_httpPort + "/";
141 } 144 }
142 } 145 }
143 set { 146 set {