diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
| commit | 8fe0084108202f307291d5d9be586e5186c2b1de (patch) | |
| tree | ade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/newview/llviewerwindow.cpp | |
| parent | 9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff) | |
| parent | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff) | |
Merge. Refresh from viewer-library-refresh after 3.7.13 release.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index d052906bee..4d263c118b 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1075,7 +1075,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK // *HACK: this should be rolled into the composite tool logic, not // hardcoded at the top level. - if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgentCamera.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance()) + if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgentCamera.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance() && gAgent.isInitialized()) { // If the current tool didn't process the click, we should show // the pie menu. This can be done by passing the event to the pie |