diff options
| author | Melanie | 2011-12-12 11:09:13 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-12 11:09:13 +0100 |
| commit | 95d533ce8a18be6451fb3492f6f659bcb2bbe241 (patch) | |
| tree | a914550165e016b9746a0f1911c9dc2f4ca6c28c /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |
| parent | Send changed animation event asynchronously (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.zip opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.gz opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.bz2 opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
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 9e7c8da..0d7d5ea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -396,6 +396,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 396 | { | 396 | { |
| 397 | return m_OSSL_Functions.osParseJSON(JSON); | 397 | return m_OSSL_Functions.osParseJSON(JSON); |
| 398 | } | 398 | } |
| 399 | |||
| 400 | public Object osParseJSONNew(string JSON) | ||
| 401 | { | ||
| 402 | return m_OSSL_Functions.osParseJSONNew(JSON); | ||
| 403 | } | ||
| 399 | 404 | ||
| 400 | public void osMessageObject(key objectUUID,string message) | 405 | public void osMessageObject(key objectUUID,string message) |
| 401 | { | 406 | { |