diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 22:25:41 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 22:25:41 -0400 |
| commit | 9bd439e7c711de25ac65843c24575734f53f092f (patch) | |
| tree | c54b7b52d5e81222b5f6590041dee0cfe5246f89 /indra/newview/llagentcamera.cpp | |
| parent | 379f9b824087a44f7ffab0becfafaa29611751be (diff) | |
| parent | 158e647247f67344a5d7a9dde6ccc80bad615c9a (diff) | |
STORM-255 : Merge from viewer-development
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")) |