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

Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

mysql-performance
Justin Clark-Casey (justincc) 2009-12-15 16:24:29 +00:00
parent 57d60a95a2 9aea69a549
commit 00365fff02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1739,7 +1739,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;
@ -1750,7 +1750,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;
@ -1761,7 +1761,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;