diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
| commit | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch) | |
| tree | 3eddbd3f421f430c9b03487261e89c95017657b9 /indra/newview/lltoolpie.cpp | |
| parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
| parent | 77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff) | |
merge changes for DRTVWR-250
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 3cd761b73b..a0c12df834 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -125,9 +125,10 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask) mPick.mKeyMask = mask; // claim not handled so UI focus stays same - - handleRightClickPick(); - + if(gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) + { + handleRightClickPick(); + } return FALSE; } |