diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
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 8aa1249..a652cb8 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 | Hashtable osParseJSON(string JSON); | 263 | Hashtable osParseJSON(string JSON); |
| 263 | 264 | ||
| 264 | void osMessageObject(key objectUUID,string message); | 265 | void osMessageObject(key objectUUID,string message); |