diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-08-06 09:22:43 -0700 |
| commit | 81c342dfa9ac04378e22c76f119408e6e00c0f13 (patch) | |
| tree | 728de42a95d436d7a753bf3884d683d4201b5ad0 /indra/newview/llviewerwindow.cpp | |
| parent | 3b2f456416d29534cb41fc9d4ad3bf195dcfc847 (diff) | |
| parent | 1346949e4d601e8c945fa30593ba1d405e9ed80d (diff) | |
Merge with 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 |