diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-02 15:59:24 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-02 15:59:24 -0700 |
| commit | 0f6c3a167850a34bad9982ed29eb25c141845320 (patch) | |
| tree | 800d474cce6f33a1eb05a6838802235aff58a83e /indra/newview/llagentcamera.cpp | |
| parent | be151807222ffa5972256aa9a392e8a319eae5ee (diff) | |
| parent | 9cc290ef8fccdc585027d84ac9cfb864ed933061 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 68e408d3e4..7c953cd2dc 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -296,8 +296,11 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) LLSelectMgr::getInstance()->deselectAll(); } - // Hide all popup menus - gMenuHolder->hideMenus(); + if (gMenuHolder != NULL) + { + // Hide all popup menus + gMenuHolder->hideMenus(); + } } if (change_camera && !gSavedSettings.getBOOL("FreezeTime")) |