diff options
author | Melanie Thielker | 2015-05-26 21:05:00 +0200 |
---|---|---|
committer | root | 2015-05-26 21:05:59 +0200 |
commit | 9766dc1f81521684a892fea60c87514183cc6d42 (patch) | |
tree | f9b0542b42e484c68d033cc43933a3a347133462 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Comment spammy XMLRPC router message - we don't need to know every time a (diff) | |
download | opensim-SC_OLD-9766dc1f81521684a892fea60c87514183cc6d42.zip opensim-SC_OLD-9766dc1f81521684a892fea60c87514183cc6d42.tar.gz opensim-SC_OLD-9766dc1f81521684a892fea60c87514183cc6d42.tar.bz2 opensim-SC_OLD-9766dc1f81521684a892fea60c87514183cc6d42.tar.xz |
Add WhiteCore's LL Json functions
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 25 |
2 files changed, 35 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index e6ab6ec..0e22ff3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -788,6 +788,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
788 | public const int KFM_CMD_STOP = 1; | 788 | public const int KFM_CMD_STOP = 1; |
789 | public const int KFM_CMD_PAUSE = 2; | 789 | public const int KFM_CMD_PAUSE = 2; |
790 | 790 | ||
791 | public const string JSON_ARRAY = "JSON_ARRAY"; | ||
792 | public const string JSON_OBJECT = "JSON_OBJECT"; | ||
793 | public const string JSON_INVALID = "JSON_INVALID"; | ||
794 | public const string JSON_NUMBER = "JSON_NUMBER"; | ||
795 | public const string JSON_STRING = "JSON_STRING"; | ||
796 | public const string JSON_TRUE = "JSON_TRUE"; | ||
797 | public const string JSON_FALSE = "JSON_FALSE"; | ||
798 | public const string JSON_NULL = "JSON_NULL"; | ||
799 | public const string JSON_APPEND = "JSON_APPEND"; | ||
800 | |||
791 | /// <summary> | 801 | /// <summary> |
792 | /// process name parameter as regex | 802 | /// process name parameter as regex |
793 | /// </summary> | 803 | /// </summary> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 78c41a7..5047162 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -2029,5 +2029,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
2029 | { | 2029 | { |
2030 | return m_LSL_Functions.llGetAnimationOverride(anim_state); | 2030 | return m_LSL_Functions.llGetAnimationOverride(anim_state); |
2031 | } | 2031 | } |
2032 | |||
2033 | public LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers) | ||
2034 | { | ||
2035 | return m_LSL_Functions.llJsonGetValue(json, specifiers); | ||
2036 | } | ||
2037 | |||
2038 | public LSL_List llJson2List(LSL_String json) | ||
2039 | { | ||
2040 | return m_LSL_Functions.llJson2List(json); | ||
2041 | } | ||
2042 | |||
2043 | public LSL_String llList2Json(LSL_String type, LSL_List values) | ||
2044 | { | ||
2045 | return m_LSL_Functions.llList2Json(type, values); | ||
2046 | } | ||
2047 | |||
2048 | public LSL_String llJsonSetValue(LSL_String json, LSL_List specifiers, LSL_String value) | ||
2049 | { | ||
2050 | return m_LSL_Functions.llJsonSetValue(json, specifiers, value); | ||
2051 | } | ||
2052 | |||
2053 | public LSL_String llJsonValueType(LSL_String json, LSL_List specifiers) | ||
2054 | { | ||
2055 | return m_LSL_Functions.llJsonValueType(json, specifiers); | ||
2056 | } | ||
2032 | } | 2057 | } |
2033 | } | 2058 | } |