diff options
| author | Justin Clark-Casey (justincc) | 2012-08-17 22:50:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-17 22:50:54 +0100 |
| commit | 3ad827174e6865b55586458bbb345d737ed6181d (patch) | |
| tree | bdae6d0dbee0e273ecaac2d2ecd1aa4477023020 /OpenSim/Region/Framework | |
| parent | Add information to ThreadStackSize about possibly increasing if suffering Sta... (diff) | |
| parent | BulletSim: Properly regenerate hulls when objects made physical. (diff) | |
| download | opensim-SC_OLD-3ad827174e6865b55586458bbb345d737ed6181d.zip opensim-SC_OLD-3ad827174e6865b55586458bbb345d737ed6181d.tar.gz opensim-SC_OLD-3ad827174e6865b55586458bbb345d737ed6181d.tar.bz2 opensim-SC_OLD-3ad827174e6865b55586458bbb345d737ed6181d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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) |