diff options
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.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, 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 c447d1f..7eb347e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -259,6 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 259 | 259 | ||
| 260 | string osGetScriptEngineName(); | 260 | string osGetScriptEngineName(); |
| 261 | string osGetSimulatorVersion(); | 261 | string osGetSimulatorVersion(); |
| 262 | string osGetPhysicsEngineType(); | ||
| 262 | Object osParseJSONNew(string JSON); | 263 | Object osParseJSONNew(string JSON); |
| 263 | Hashtable osParseJSON(string JSON); | 264 | Hashtable osParseJSON(string JSON); |
| 264 | 265 | ||