From ef358051767546d1ae991112c80135041222018a Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 19 May 2017 03:08:35 +0100 Subject: reWrite lsl json functions, forward slash is not escaped as LitJson spec; code can use some cleanup. Scripts need to be recompiled --- .../ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index ce0fa48..a277f6c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -29,6 +29,7 @@ using System; using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; +using LSLString = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { @@ -834,15 +835,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int KFM_CMD_STOP = 1; public const int KFM_CMD_PAUSE = 2; - public const string JSON_ARRAY = "JSON_ARRAY"; - public const string JSON_OBJECT = "JSON_OBJECT"; - public const string JSON_INVALID = "JSON_INVALID"; - public const string JSON_NUMBER = "JSON_NUMBER"; - public const string JSON_STRING = "JSON_STRING"; - public const string JSON_TRUE = "JSON_TRUE"; - public const string JSON_FALSE = "JSON_FALSE"; - public const string JSON_NULL = "JSON_NULL"; - public const string JSON_APPEND = "JSON_APPEND"; + public const string JSON_INVALID = "\uFDD0"; + public const string JSON_OBJECT = "\uFDD1"; + public const string JSON_ARRAY = "\uFDD2"; + public const string JSON_NUMBER = "\uFDD3"; + public const string JSON_STRING = "\uFDD4"; + public const string JSON_NULL = "\uFDD5"; + public const string JSON_TRUE = "\uFDD6"; + public const string JSON_FALSE = "\uFDD7"; + public const string JSON_DELETE = "\uFDD8"; + public const string JSON_APPEND = "-1"; /// /// process name parameter as regex -- cgit v1.1