diff options
| author | Melanie | 2009-08-06 21:20:57 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-06 21:20:57 +0100 |
| commit | eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e (patch) | |
| tree | a5b3d1ab68f5b9974cfed174c96f25cd710b542e /OpenSim/Region/Framework/Scenes | |
| parent | Add the addon modules folder (diff) | |
| parent | goose panda (diff) | |
| download | opensim-SC-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.zip opensim-SC-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.gz opensim-SC-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.bz2 opensim-SC-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fa1fd89..50baa9b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1218,9 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1218 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) | 1218 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) |
| 1219 | { | 1219 | { |
| 1220 | StandUp(); | 1220 | StandUp(); |
| 1221 | } | 1221 | } |
| 1222 | |||
| 1223 | |||
| 1224 | 1222 | ||
| 1225 | // Check if Client has camera in 'follow cam' or 'build' mode. | 1223 | // Check if Client has camera in 'follow cam' or 'build' mode. |
| 1226 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); | 1224 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); |