diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-07-22 15:54:53 -0700 |
| commit | 87a7eee21d986e2a1c8b5fd467b5da06112690b5 (patch) | |
| tree | 609741b2e3d0bfe72843342c19e67b7d78f602f4 /indra/newview/llviewerwindow.cpp | |
| parent | cec79bdb29ac5438c9b9bb0312b4981116f17f61 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Sync merge with lindenlab/viewer-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 |