From 0c03a48fb2060eda4d288e2d2ca4e650ce000b4b Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Wed, 4 Feb 2009 00:01:36 +0000 Subject: - add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of it - trim trailing whitespace --- .../Shared/Api/Implementation/OSSL_Api.cs | 124 ++++++++++----------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3e7ffab..734b3ef 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -37,8 +37,8 @@ using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.ScriptEngine.Shared; -using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; +using OpenSim.Region.ScriptEngine.Shared; +using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; using OpenSim.Region.ScriptEngine.Shared.ScriptBase; using OpenSim.Region.ScriptEngine.Interfaces; using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; @@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host = host; m_localID = localID; m_itemID = itemID; - + if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) m_OSFunctionsEnabled = true; @@ -328,9 +328,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.VeryHigh, "osRegionNotice"); m_host.AddScriptLPS(1); - + IDialogModule dm = World.RequestModuleInterface(); - + if (dm != null) dm.SendGeneralAlert(msg); } @@ -776,7 +776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return String.Empty; } } - + public string osGetSimulatorVersion() { // High because it can be used to target attacks to known weaknesses @@ -802,37 +802,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api World.ParcelMediaSetTime((float)time); } - + public Hashtable osParseJSON(string JSON) { CheckThreatLevel(ThreatLevel.None, "osParseJSON"); - + m_host.AddScriptLPS(1); // see http://www.json.org/ for more details on JSON - + string currentKey=null; Stack objectStack = new Stack(); // objects in JSON can be nested so we need to keep a track of this Hashtable jsondata = new Hashtable(); // the hashtable to be returned int i=0; try { - + // iterate through the serialised stream of tokens and store at the right depth in the hashtable // the top level hashtable may contain more nested hashtables within it each containing an objects representation for (i=0;i