diff options
| author | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
| commit | d071aeb6f1ff0d98e27e93391f004d6ff947e3b1 (patch) | |
| tree | faa6d458733c4f6288974ab370d7f480ed73a17c /indra/newview/llviewerwindow.cpp | |
| parent | 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 (diff) | |
| parent | d576e66210c020a8a86bcc88898a352bc0875d9a (diff) | |
merge
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 |