Update svn properties, minor formatting cleanup.

This commit is contained in:
Jeff Ames
2008-10-05 14:15:39 +00:00
parent a243a4aaf5
commit aab6cdd8b0
11 changed files with 58 additions and 58 deletions

View File

@@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (cindex > 0)
{
ret.Add(str.Substring(0, cindex));
}
}
// Cannot use spacers.Contains() because spacers may be either type String or LSLString
for (int j = 0; j < spacers.Length; j++)
{

View File

@@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return String.Empty;
}
}
public string osGetSimulatorVersion()
{
public string osGetSimulatorVersion()
{
// High because it can be used to target attacks to known weaknesses
// This would allow a new class of griefer scripts that don't even
// require their user to know what they are doing (see script
// kiddie)
//
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
m_host.AddScriptLPS(1);
return m_ScriptEngine.World.GetSimulatorVersion();
}
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
m_host.AddScriptLPS(1);
return m_ScriptEngine.World.GetSimulatorVersion();
}
//for testing purposes only

View File

@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osSetRegionWaterHeight(double height);
string osGetScriptEngineName();
string osGetSimulatorVersion();
string osGetSimulatorVersion();
void osSetParcelMediaTime(double time);
Hashtable osParseJSON(string JSON);

View File

@@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
//Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
#endif
// Found
try
{
ev.Invoke(m_Script, args);
}
catch (TargetInvocationException tie)
{
// Grab the inner exception and rethrow it
throw tie.InnerException;
}
catch (Exception e)
{
throw e;
}
try
{
ev.Invoke(m_Script, args);
}
catch (TargetInvocationException tie)
{
// Grab the inner exception and rethrow it
throw tie.InnerException;
}
catch (Exception e)
{
throw e;
}
}
protected void initEventFlags()

View File

@@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
return m_OSSL_Functions.osGetScriptEngineName();
}
public string osGetSimulatorVersion()
{
return m_OSSL_Functions.osGetSimulatorVersion();
}
public string osGetSimulatorVersion()
{
return m_OSSL_Functions.osGetSimulatorVersion();
}
//for testing purposes only