diff options
| author | Melanie | 2012-05-30 16:10:01 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-30 16:10:01 +0200 |
| commit | 86f786d673792b0499709d2f5e90b84b610d274e (patch) | |
| tree | c701e3d895bdfe35558d90adf6d25a8e94371cb2 /OpenSim | |
| parent | Fix the log standing attach-from-world bug. (diff) | |
| download | opensim-SC-86f786d673792b0499709d2f5e90b84b610d274e.zip opensim-SC-86f786d673792b0499709d2f5e90b84b610d274e.tar.gz opensim-SC-86f786d673792b0499709d2f5e90b84b610d274e.tar.bz2 opensim-SC-86f786d673792b0499709d2f5e90b84b610d274e.tar.xz | |
Prevent multiple requests to go physical from reaching the physics plugin
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index eb68038..ea78dc3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1312,6 +1312,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1312 | if (!allow) | 1312 | if (!allow) |
| 1313 | return; | 1313 | return; |
| 1314 | 1314 | ||
| 1315 | if (m_host.ParentGroup.RootPart.PhysActor != null && | ||
| 1316 | m_host.ParentGroup.RootPart.PhysActor.IsPhysical) | ||
| 1317 | return; | ||
| 1318 | |||
| 1315 | m_host.ScriptSetPhysicsStatus(true); | 1319 | m_host.ScriptSetPhysicsStatus(true); |
| 1316 | } | 1320 | } |
| 1317 | else | 1321 | else |