diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
| commit | ee87ef23037f5e2904dfea3da061a9548cc113f5 (patch) | |
| tree | d3aaa5405c97866529e2029572d81ebbd90b8d4a /indra/newview/lltoolpie.cpp | |
| parent | 07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff) | |
| parent | 60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff) | |
merge downstream code from viewer-lion
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; } |