diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-29 19:52:01 -0700 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-29 19:52:01 -0700 |
| commit | fa17864382a64c90e9106a54368386f6e4115d67 (patch) | |
| tree | 7883e97e7bd4d3b0a7d9ac7a0096424e71e0c1ad /indra/newview/llagentcamera.cpp | |
| parent | 4b49b0eff79c41060ba53d0d33ff83b4c18e277b (diff) | |
| parent | 42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff) | |
Merge with lindenlab/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")) |