diff options
author | Robert Adams | 2012-08-17 14:45:18 -0700 |
---|---|---|
committer | Robert Adams | 2012-08-17 14:45:18 -0700 |
commit | 7243d4f84248092eb5fe4ebe3673501bc84ce250 (patch) | |
tree | 0d6ace8f444a2f96dfe97dbc924316573f0d5274 /OpenSim/Region/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-7243d4f84248092eb5fe4ebe3673501bc84ce250.zip opensim-SC-7243d4f84248092eb5fe4ebe3673501bc84ce250.tar.gz opensim-SC-7243d4f84248092eb5fe4ebe3673501bc84ce250.tar.bz2 opensim-SC-7243d4f84248092eb5fe4ebe3673501bc84ce250.tar.xz |
BulletSim: Properly regenerate hulls when objects made physical.
This fixes the problem of non-base shapes (cubes and spheres)
falling through the terrain.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 98afb75..65d526f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1392,14 +1392,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1392 | else if (FlyDisabled) | 1392 | else if (FlyDisabled) |
1393 | newFlying = false; | 1393 | newFlying = false; |
1394 | else | 1394 | else |
1395 | newFlying = ((flags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); | 1395 | newFlying = ((flags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); |
1396 | 1396 | ||
1397 | if (actor.Flying != newFlying) | 1397 | if (actor.Flying != newFlying) |
1398 | { | 1398 | { |
1399 | // Note: ScenePresence.Flying is actually fetched from the physical actor | 1399 | // Note: ScenePresence.Flying is actually fetched from the physical actor |
1400 | // so setting PhysActor.Flying here also sets the ScenePresence's value. | 1400 | // so setting PhysActor.Flying here also sets the ScenePresence's value. |
1401 | actor.Flying = newFlying; | 1401 | actor.Flying = newFlying; |
1402 | update_movementflag = true; | 1402 | update_movementflag = true; |
1403 | } | 1403 | } |
1404 | 1404 | ||
1405 | if (ParentID == 0) | 1405 | if (ParentID == 0) |