Thank you, patnad, for a patch that adds 3 new discovery functions
to OSSL. Applied with changes. Fixes Mantis #31720.6.3-post-fixes
parent
312b0f91c4
commit
7d77e0e703
|
@ -1066,5 +1066,44 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
|
|
||||||
m_host.Inventory.AddInventoryItem(taskItem, false);
|
m_host.Inventory.AddInventoryItem(taskItem, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Threat level is Moderate because intentional abuse, for instance
|
||||||
|
/// scripts that are written to be malicious only on one grid,
|
||||||
|
/// for instance in a HG scenario, are a distinct possibility.
|
||||||
|
///
|
||||||
|
/// Use value from the config file and return it.
|
||||||
|
///
|
||||||
|
public string osGetGridNick()
|
||||||
|
{
|
||||||
|
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
string nick = "hippogrid";
|
||||||
|
IConfigSource config = new IniConfigSource(Application.iniFilePath);
|
||||||
|
if (config.Configs["GridInfo"] != null)
|
||||||
|
nick = config.Configs["GridInfo"].GetString("gridnick", nick);
|
||||||
|
return nick;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string osGetGridName()
|
||||||
|
{
|
||||||
|
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
string name = "the lost continent of hippo";
|
||||||
|
IConfigSource config = new IniConfigSource(Application.iniFilePath);
|
||||||
|
if (config.Configs["GridInfo"] != null)
|
||||||
|
name = config.Configs["GridInfo"].GetString("gridname", name);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string osGetGridLoginURI()
|
||||||
|
{
|
||||||
|
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
|
||||||
|
m_host.AddScriptLPS(1);
|
||||||
|
string loginURI = "http://127.0.0.1:9000/";
|
||||||
|
IConfigSource config = new IniConfigSource(Application.iniFilePath);
|
||||||
|
if (config.Configs["GridInfo"] != null)
|
||||||
|
loginURI = config.Configs["GridInfo"].GetString("login", loginURI);
|
||||||
|
return loginURI;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,5 +99,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
||||||
void osMessageObject(key objectUUID,string message);
|
void osMessageObject(key objectUUID,string message);
|
||||||
|
|
||||||
void osMakeNotecard(string notecardName, LSL_Types.list contents);
|
void osMakeNotecard(string notecardName, LSL_Types.list contents);
|
||||||
|
|
||||||
|
// Grid Info Functions
|
||||||
|
string osGetGridNick();
|
||||||
|
string osGetGridName();
|
||||||
|
string osGetGridLoginURI();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -247,6 +247,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
m_OSSL_Functions.osMakeNotecard(notecardName, contents);
|
m_OSSL_Functions.osMakeNotecard(notecardName, contents);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string osGetGridNick()
|
||||||
|
{
|
||||||
|
return m_OSSL_Functions.osGetGridNick();
|
||||||
|
}
|
||||||
|
|
||||||
|
public string osGetGridName()
|
||||||
|
{
|
||||||
|
return m_OSSL_Functions.osGetGridName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public string osGetGridLoginURI()
|
||||||
|
{
|
||||||
|
return m_OSSL_Functions.osGetGridLoginURI();
|
||||||
|
}
|
||||||
|
|
||||||
public OSSLPrim Prim;
|
public OSSLPrim Prim;
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
|
|
Loading…
Reference in New Issue