aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-02-27 19:43:31 +0000
committerJustin Clark-Casey (justincc)2015-02-27 19:43:31 +0000
commitca7cc9b2e29777cb3be4bb5cb147010819de3602 (patch)
treefffbc7ba2229056c3c799e134d3fc717f2b16fa0 /OpenSim/Region
parentRevert "Adding dynamic ossl permission control" (diff)
downloadopensim-SC_OLD-ca7cc9b2e29777cb3be4bb5cb147010819de3602.zip
opensim-SC_OLD-ca7cc9b2e29777cb3be4bb5cb147010819de3602.tar.gz
opensim-SC_OLD-ca7cc9b2e29777cb3be4bb5cb147010819de3602.tar.bz2
opensim-SC_OLD-ca7cc9b2e29777cb3be4bb5cb147010819de3602.tar.xz
Don't slide crouching avatar when camera is panned around them with left mouse button
This matches linden lab grid behaviour
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 973f2cf..a03593e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2128,7 +2128,9 @@ namespace OpenSim.Region.Framework.Scenes
2128 2128
2129 try 2129 try
2130 { 2130 {
2131 agent_control_v3 += dirVectors[i]; 2131 // Don't slide against ground when crouching if camera is panned around avatar
2132 if (Flying || DCF != Dir_ControlFlags.DIR_CONTROL_FLAG_DOWN)
2133 agent_control_v3 += dirVectors[i];
2132 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]); 2134 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]);
2133 } 2135 }
2134 catch (IndexOutOfRangeException) 2136 catch (IndexOutOfRangeException)