diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs')
| -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 cdd9ea8..51d0581 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 | ||