diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
2 files changed, 4 insertions, 4 deletions
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 | |||
108 | { | 108 | { |
109 | // OK, we tried but there are no regions matching that name. | 109 | // OK, we tried but there are no regions matching that name. |
110 | // Let's check quickly if this is a domain name, and if so link to it | 110 | // Let's check quickly if this is a domain name, and if so link to it |
111 | if (mapName.Contains(".") && mapName.Contains(":")) | 111 | if (mapName.Contains(".")) |
112 | { | 112 | { |
113 | // It probably is a domain name. Try to link to it. | 113 | // It probably is a domain name. Try to link to it. |
114 | GridRegion regInfo; | 114 | 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 | |||
1743 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick"); | 1743 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick"); |
1744 | m_host.AddScriptLPS(1); | 1744 | m_host.AddScriptLPS(1); |
1745 | string nick = "hippogrid"; | 1745 | string nick = "hippogrid"; |
1746 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 1746 | IConfigSource config = m_ScriptEngine.ConfigSource; |
1747 | if (config.Configs["GridInfo"] != null) | 1747 | if (config.Configs["GridInfo"] != null) |
1748 | nick = config.Configs["GridInfo"].GetString("gridnick", nick); | 1748 | nick = config.Configs["GridInfo"].GetString("gridnick", nick); |
1749 | return nick; | 1749 | return nick; |
@@ -1754,7 +1754,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1754 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName"); | 1754 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName"); |
1755 | m_host.AddScriptLPS(1); | 1755 | m_host.AddScriptLPS(1); |
1756 | string name = "the lost continent of hippo"; | 1756 | string name = "the lost continent of hippo"; |
1757 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 1757 | IConfigSource config = m_ScriptEngine.ConfigSource; |
1758 | if (config.Configs["GridInfo"] != null) | 1758 | if (config.Configs["GridInfo"] != null) |
1759 | name = config.Configs["GridInfo"].GetString("gridname", name); | 1759 | name = config.Configs["GridInfo"].GetString("gridname", name); |
1760 | return name; | 1760 | return name; |
@@ -1765,7 +1765,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1765 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI"); | 1765 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI"); |
1766 | m_host.AddScriptLPS(1); | 1766 | m_host.AddScriptLPS(1); |
1767 | string loginURI = "http://127.0.0.1:9000/"; | 1767 | string loginURI = "http://127.0.0.1:9000/"; |
1768 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 1768 | IConfigSource config = m_ScriptEngine.ConfigSource; |
1769 | if (config.Configs["GridInfo"] != null) | 1769 | if (config.Configs["GridInfo"] != null) |
1770 | loginURI = config.Configs["GridInfo"].GetString("login", loginURI); | 1770 | loginURI = config.Configs["GridInfo"].GetString("login", loginURI); |
1771 | return loginURI; | 1771 | return loginURI; |