Merge branch 'master' into careminster

3 files changed, 6 insertions, 6 deletions

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;
     }
 }
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;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d7480e6..bd09534 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1743,7 +1743,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;
@@ -1754,7 +1754,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;
@@ -1765,7 +1765,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;