diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-27 11:44:33 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-27 11:44:33 -0700 |
| commit | 158e647247f67344a5d7a9dde6ccc80bad615c9a (patch) | |
| tree | edb10af9f58e44f90ffc8d23a77d4e8c3ee19617 /indra | |
| parent | 1868e102c2ea52752e345c19f7859d43be9d5a5d (diff) | |
| parent | ea32129f493712fd8d03d8c3454f78f89f268e61 (diff) | |
STORM-452 : merge with viewer-development
Diffstat (limited to 'indra')
| -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")) |