diff options
| author | Melanie | 2013-03-03 13:24:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-03 13:24:37 +0000 |
| commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
| tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make Keyframe motion cross regions again (diff) | |
| download | opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC_OLD-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC_OLD-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/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 7eb347e..a652cb8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -260,7 +260,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 260 | string osGetScriptEngineName(); | 260 | string osGetScriptEngineName(); |
| 261 | string osGetSimulatorVersion(); | 261 | string osGetSimulatorVersion(); |
| 262 | string osGetPhysicsEngineType(); | 262 | string osGetPhysicsEngineType(); |
| 263 | Object osParseJSONNew(string JSON); | ||
| 264 | Hashtable osParseJSON(string JSON); | 263 | Hashtable osParseJSON(string JSON); |
| 265 | 264 | ||
| 266 | void osMessageObject(key objectUUID,string message); | 265 | void osMessageObject(key objectUUID,string message); |