diff options
| author | dahlia | 2013-12-06 15:58:51 -0800 |
|---|---|---|
| committer | dahlia | 2013-12-06 15:58:51 -0800 |
| commit | aba2a444538fc0ab5ae093004dc9994abab299e3 (patch) | |
| tree | 21b1dc7790e08ba8de07c073dd7b6186ce10d938 /OpenSim/Region/Framework/Scenes | |
| parent | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ... (diff) | |
| parent | Add support for user preferences (im via email) (diff) | |
| download | opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.zip opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.gz opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.bz2 opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1dc7e20..7ed3a4b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1648,12 +1648,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1648 | 1648 | ||
| 1649 | if (AllowMovement && !SitGround) | 1649 | if (AllowMovement && !SitGround) |
| 1650 | { | 1650 | { |
| 1651 | Quaternion bodyRotation = agentData.BodyRotation; | 1651 | // m_log.DebugFormat("[SCENE PRESENCE]: Initial body rotation {0} for {1}", agentData.BodyRotation, Name); |
| 1652 | |||
| 1652 | bool update_rotation = false; | 1653 | bool update_rotation = false; |
| 1653 | 1654 | ||
| 1654 | if (bodyRotation != Rotation) | 1655 | if (agentData.BodyRotation != Rotation) |
| 1655 | { | 1656 | { |
| 1656 | Rotation = bodyRotation; | 1657 | Rotation = agentData.BodyRotation; |
| 1657 | update_rotation = true; | 1658 | update_rotation = true; |
| 1658 | } | 1659 | } |
| 1659 | 1660 | ||