diff options
| author | Melanie | 2013-01-16 01:11:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:11:20 +0000 |
| commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
| tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz | |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index afa9ae0..c9902e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -420,6 +420,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 420 | return m_OSSL_Functions.osGetScriptEngineName(); | 420 | return m_OSSL_Functions.osGetScriptEngineName(); |
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | public string osGetPhysicsEngineType() | ||
| 424 | { | ||
| 425 | return m_OSSL_Functions.osGetPhysicsEngineType(); | ||
| 426 | } | ||
| 427 | |||
| 423 | public string osGetSimulatorVersion() | 428 | public string osGetSimulatorVersion() |
| 424 | { | 429 | { |
| 425 | return m_OSSL_Functions.osGetSimulatorVersion(); | 430 | return m_OSSL_Functions.osGetSimulatorVersion(); |