aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorDr Scofield2008-09-18 16:53:26 +0000
committerDr Scofield2008-09-18 16:53:26 +0000
commit0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0 (patch)
tree446e13c296397ea90bf3ba2ffabd8dcdfa6e2932 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.zip
opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.gz
opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.bz2
opensim-SC_OLD-0dff3f2383593dedee9c5b2e8d8668a8ad0ce6d0.tar.xz
From: Robert Smart (SMARTROB@uk.ibm.com)
Patch for new scripting method osParseJSON. also, a couple of warning bugs killed.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 3a7c14e..de11d06 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -219,5 +219,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
219 { 219 {
220 m_OSSL_Functions.osSetParcelMediaTime(time); 220 m_OSSL_Functions.osSetParcelMediaTime(time);
221 } 221 }
222
223 public Hashtable osParseJSON(string JSON)
224 {
225 return m_OSSL_Functions.osParseJSON(JSON);
226 }
222 } 227 }
223} 228}