diff options
| author | UbitUmarov | 2015-09-28 16:40:55 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-28 16:40:55 +0100 |
| commit | fb69661bb9c98b959a57e4e54a756c09a804e344 (patch) | |
| tree | 791a5df585faec1b46bacc5a2abc2c4c2fe78207 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | ... post merge issue (diff) | |
| download | opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.zip opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.gz opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.bz2 opensim-SC_OLD-fb69661bb9c98b959a57e4e54a756c09a804e344.tar.xz | |
... ossl merge issue
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, 1 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 ddd7630..4e567e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -261,6 +261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 261 | string osGetSimulatorVersion(); | 261 | string osGetSimulatorVersion(); |
| 262 | LSL_Integer osCheckODE(); | 262 | LSL_Integer osCheckODE(); |
| 263 | string osGetPhysicsEngineType(); | 263 | string osGetPhysicsEngineType(); |
| 264 | Object osParseJSONNew(string JSON); | ||
| 264 | Hashtable osParseJSON(string JSON); | 265 | Hashtable osParseJSON(string JSON); |
| 265 | 266 | ||
| 266 | void osMessageObject(key objectUUID,string message); | 267 | void osMessageObject(key objectUUID,string message); |