summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-13 11:51:44 -0700
committerRichard Linden <none@none>2011-03-13 11:51:44 -0700
commit5dc467b4f7940f31b0e98798eb6aa2d82a2d4919 (patch)
treeda1fe42f67dfac68227c2710c7f19957864bbf68 /indra
parent298258d3d1518e9da3785aa8749381a8aa2fc984 (diff)
only enable click to steer with "ClickToWalk" is turned on
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltoolpie.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 5bfc69016b..698d55836c 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -524,7 +524,7 @@ void LLToolPie::selectionPropertiesReceived()
BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
{
- if (!mMouseOutsideSlop && mMouseButtonDown)
+ if (!mMouseOutsideSlop && mMouseButtonDown && gSavedSettings.getBOOL("ClickToWalk"))
{
S32 delta_x = x - mMouseDownX;
S32 delta_y = y - mMouseDownY;
@@ -1318,7 +1318,7 @@ void LLToolPie::stopCameraSteering()
bool LLToolPie::inCameraSteerMode()
{
- return mMouseButtonDown && mMouseOutsideSlop;
+ return mMouseButtonDown && mMouseOutsideSlop && gSavedSettings.getBOOL("ClickToWalk");
}
// true if x,y outside small box around start_x,start_y