aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
diff options
context:
space:
mode:
authorMelanie2013-03-03 13:24:37 +0000
committerMelanie2013-03-03 13:24:37 +0000
commitf39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch)
treea5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
parentMerge branch 'master' into careminster (diff)
parentMake Keyframe motion cross regions again (diff)
downloadopensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c9902e4..b63773b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -435,11 +435,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
435 return m_OSSL_Functions.osParseJSON(JSON); 435 return m_OSSL_Functions.osParseJSON(JSON);
436 } 436 }
437 437
438 public Object osParseJSONNew(string JSON)
439 {
440 return m_OSSL_Functions.osParseJSONNew(JSON);
441 }
442
443 public void osMessageObject(key objectUUID,string message) 438 public void osMessageObject(key objectUUID,string message)
444 { 439 {
445 m_OSSL_Functions.osMessageObject(objectUUID,message); 440 m_OSSL_Functions.osMessageObject(objectUUID,message);