OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-15 15:46:18 +00:00
parent 0020afaf67 9aea69a549
commit f8b6bc8d11
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/ConfigSettings.cs
View File

@ -168,7 +168,7 @@ namespace OpenSim.Framework
public const bool DefaultUserServerHttpSSL = false; public const bool DefaultUserServerHttpSSL = false;
public const uint DefaultMessageServerHttpPort = 8006; public const uint DefaultMessageServerHttpPort = 8006;
public const bool DefaultMessageServerHttpSSL = false; public const bool DefaultMessageServerHttpSSL = false;
public const uint DefaultGridServerHttpPort = 8001; public const uint DefaultGridServerHttpPort = 8003;
public const uint DefaultInventoryServerHttpPort = 8004; public const uint DefaultInventoryServerHttpPort = 8003;
} }
} }

2
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{ {
// OK, we tried but there are no regions matching that name. // 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 // 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. // It probably is a domain name. Try to link to it.
GridRegion regInfo; GridRegion regInfo;

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1743,7 +1743,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick"); CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
string nick = "hippogrid"; string nick = "hippogrid";
IConfigSource config = new IniConfigSource(Application.iniFilePath); IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs["GridInfo"] != null) if (config.Configs["GridInfo"] != null)
nick = config.Configs["GridInfo"].GetString("gridnick", nick); nick = config.Configs["GridInfo"].GetString("gridnick", nick);
return nick; return nick;
@ -1754,7 +1754,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName"); CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
string name = "the lost continent of hippo"; string name = "the lost continent of hippo";
IConfigSource config = new IniConfigSource(Application.iniFilePath); IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs["GridInfo"] != null) if (config.Configs["GridInfo"] != null)
name = config.Configs["GridInfo"].GetString("gridname", name); name = config.Configs["GridInfo"].GetString("gridname", name);
return name; return name;
@ -1765,7 +1765,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI"); CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
string loginURI = "http://127.0.0.1:9000/"; string loginURI = "http://127.0.0.1:9000/";
IConfigSource config = new IniConfigSource(Application.iniFilePath); IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs["GridInfo"] != null) if (config.Configs["GridInfo"] != null)
loginURI = config.Configs["GridInfo"].GetString("login", loginURI); loginURI = config.Configs["GridInfo"].GetString("login", loginURI);
return loginURI; return loginURI;