diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
| commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
| tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/newview/llagentcamera.cpp | |
| parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
Automated merge with file:///Users/Bill/Projects/viewer-release
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")) |