From 9e54e61a4324769f119a94f480ba88f738ea9bd4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Dec 2009 08:27:16 -0800
Subject: Make the HG map search recognize host names without ports.

---
 OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 436f332..be46fa5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 // OK, we tried but there are no regions matching that name.
                 // Let's check quickly if this is a domain name, and if so link to it
-                if (mapName.Contains(".") && mapName.Contains(":"))
+                if (mapName.Contains("."))
                 {
                     // It probably is a domain name. Try to link to it.
                     GridRegion regInfo;
-- 
cgit v1.1


From ffff12f7c1902e6f41b88cb0a81761968987c57c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 15 Dec 2009 15:37:03 +0000
Subject: Change default grid and inventory service ports in ConfigSettings to
 the ROBUST default of 8003

---
 OpenSim/Framework/ConfigSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 93efffa..32415e0 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
         public const bool DefaultUserServerHttpSSL = false;
         public const uint DefaultMessageServerHttpPort = 8006;
         public const bool DefaultMessageServerHttpSSL = false;
-        public const uint DefaultGridServerHttpPort = 8001;
-        public const uint DefaultInventoryServerHttpPort = 8004;
+        public const uint DefaultGridServerHttpPort = 8003;
+        public const uint DefaultInventoryServerHttpPort = 8003;
     }
 }
-- 
cgit v1.1


From 0f616d2ffe6f8d2ab1618967f78af542aef6db29 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 15 Dec 2009 15:42:51 +0000
Subject: Prevent OSSL from crashing if the sim was loaded from a remote config
 and osGetGridName, osGetGridNick or osGetGridLoginURI is used.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1b7db7c..9c7604b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
             m_host.AddScriptLPS(1);
             string nick = "hippogrid";
-            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            IConfigSource config = m_ScriptEngine.ConfigSource;
             if (config.Configs["GridInfo"] != null)
                 nick = config.Configs["GridInfo"].GetString("gridnick", nick);
             return nick;
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
             m_host.AddScriptLPS(1);
             string name = "the lost continent of hippo";
-            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            IConfigSource config = m_ScriptEngine.ConfigSource;
             if (config.Configs["GridInfo"] != null)
                 name = config.Configs["GridInfo"].GetString("gridname", name);
             return name;
@@ -1761,7 +1761,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
             m_host.AddScriptLPS(1);
             string loginURI = "http://127.0.0.1:9000/";
-            IConfigSource config = new IniConfigSource(Application.iniFilePath);
+            IConfigSource config = m_ScriptEngine.ConfigSource;
             if (config.Configs["GridInfo"] != null)
                 loginURI = config.Configs["GridInfo"].GetString("login", loginURI);
             return loginURI;
-- 
cgit v1.1