aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authornebadon2011-12-11 23:25:12 -0700
committernebadon2011-12-11 23:25:12 -0700
commit8ae824ff095605c5889828503cec09006ac07cc0 (patch)
treec87dcf50a53184b21e30b287200d903db9f17948 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentImplement handler for TeleportCancel inbound packet (diff)
downloadopensim-SC_OLD-8ae824ff095605c5889828503cec09006ac07cc0.zip
opensim-SC_OLD-8ae824ff095605c5889828503cec09006ac07cc0.tar.gz
opensim-SC_OLD-8ae824ff095605c5889828503cec09006ac07cc0.tar.bz2
opensim-SC_OLD-8ae824ff095605c5889828503cec09006ac07cc0.tar.xz
Mantis 5816: osParseJSON Decoding Problems
osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 3221833..00ca070 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections; 29using System.Collections;
29using OpenSim.Region.ScriptEngine.Interfaces; 30using OpenSim.Region.ScriptEngine.Interfaces;
30 31
@@ -140,6 +141,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
140 141
141 string osGetScriptEngineName(); 142 string osGetScriptEngineName();
142 string osGetSimulatorVersion(); 143 string osGetSimulatorVersion();
144 Object osParseJSONNew(string JSON);
143 Hashtable osParseJSON(string JSON); 145 Hashtable osParseJSON(string JSON);
144 146
145 void osMessageObject(key objectUUID,string message); 147 void osMessageObject(key objectUUID,string message);