aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2009-08-06 21:20:57 +0100
committerMelanie2009-08-06 21:20:57 +0100
commiteb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e (patch)
treea5b3d1ab68f5b9974cfed174c96f25cd710b542e /OpenSim/Region/Framework/Scenes
parentAdd the addon modules folder (diff)
parentgoose panda (diff)
downloadopensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.zip
opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.gz
opensim-SC_OLD-eb9d584ee0bb95a9fe403516f5f8ef3c2ae8a52e.tar.bz2
opensim-SC_OLD-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.cs4
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);