diff options
| author | Melanie | 2012-05-31 03:37:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-31 03:37:43 +0100 |
| commit | e696d1d95225e3ddf90c823a2309dd8760af935b (patch) | |
| tree | 8a72f0f86f2e6fd6e2e5d779993699b66f2c8ef9 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | ubitode prim: if makebody() is called already having a body, do a full destru... (diff) | |
| download | opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.zip opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.gz opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.bz2 opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -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 03f4108..2700495 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1272,6 +1272,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1272 | if (!allow) | 1272 | if (!allow) |
| 1273 | return; | 1273 | return; |
| 1274 | 1274 | ||
| 1275 | if (m_host.ParentGroup.RootPart.PhysActor != null && | ||
| 1276 | m_host.ParentGroup.RootPart.PhysActor.IsPhysical) | ||
| 1277 | return; | ||
| 1278 | |||
| 1275 | m_host.ScriptSetPhysicsStatus(true); | 1279 | m_host.ScriptSetPhysicsStatus(true); |
| 1276 | } | 1280 | } |
| 1277 | else | 1281 | else |