From aab6cdd8b05a97c8906a67eb8d3233580fbebb2f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 5 Oct 2008 14:15:39 +0000 Subject: Update svn properties, minor formatting cleanup. --- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- .../Shared/Api/Implementation/OSSL_Api.cs | 14 ++++++------ .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +- .../ScriptEngine/Shared/Api/Runtime/Executor.cs | 26 +++++++++++----------- .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 ++++----- 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 655d85c..fffc331 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -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++) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bfe289c..ee95342 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -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 diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 48eddd2..92b77a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -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); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 5c1c57a..90598c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs @@ -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() diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f3ca326..d92ae7f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -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 -- cgit v1.1