aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorroot2013-02-25 23:01:03 +0100
committerroot2013-02-25 23:01:03 +0100
commitd7c742a5f9ee87336a9c962c772a07afa38498c5 (patch)
treea9b75be05335b3033cf26ba46bf69806d1c046ae /OpenSim/Region/ScriptEngine/Shared/Api
parentMake banking no longer break sit rotations. Fix spinning avatars. (diff)
downloadopensim-SC-d7c742a5f9ee87336a9c962c772a07afa38498c5.zip
opensim-SC-d7c742a5f9ee87336a9c962c772a07afa38498c5.tar.gz
opensim-SC-d7c742a5f9ee87336a9c962c772a07afa38498c5.tar.bz2
opensim-SC-d7c742a5f9ee87336a9c962c772a07afa38498c5.tar.xz
Remove osParseJSONNew because it's "object" return type is not useful for LSL
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
3 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7c2f8ed..8aac33f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1619,7 +1619,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1619 } 1619 }
1620 } 1620 }
1621 1621
1622 public Object osParseJSONNew(string JSON) 1622 private Object osParseJSONNew(string JSON)
1623 { 1623 {
1624 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); 1624 CheckThreatLevel(ThreatLevel.None, "osParseJSONNew");
1625 1625
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index c447d1f..8aa1249 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -259,7 +259,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
259 259
260 string osGetScriptEngineName(); 260 string osGetScriptEngineName();
261 string osGetSimulatorVersion(); 261 string osGetSimulatorVersion();
262 Object osParseJSONNew(string JSON);
263 Hashtable osParseJSON(string JSON); 262 Hashtable osParseJSON(string JSON);
264 263
265 void osMessageObject(key objectUUID,string message); 264 void osMessageObject(key objectUUID,string message);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index afa9ae0..95dff18 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -430,11 +430,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
430 return m_OSSL_Functions.osParseJSON(JSON); 430 return m_OSSL_Functions.osParseJSON(JSON);
431 } 431 }
432 432
433 public Object osParseJSONNew(string JSON)
434 {
435 return m_OSSL_Functions.osParseJSONNew(JSON);
436 }
437
438 public void osMessageObject(key objectUUID,string message) 433 public void osMessageObject(key objectUUID,string message)
439 { 434 {
440 m_OSSL_Functions.osMessageObject(objectUUID,message); 435 m_OSSL_Functions.osMessageObject(objectUUID,message);