Skip to content
Snippets Groups Projects
Commit 158e6472 authored by Merov Linden's avatar Merov Linden
Browse files

STORM-452 : merge with viewer-development

parents 1868e102 ea32129f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llagentcamera.cpp
+ 5
− 2
View file @ 158e6472
...@@ -296,8 +296,11 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) ...@@ -296,8 +296,11 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera)
LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->deselectAll();
} }
// Hide all popup menus if (gMenuHolder != NULL)
gMenuHolder->hideMenus(); {
// Hide all popup menus
gMenuHolder->hideMenus();
}
} }
if (change_camera && !gSavedSettings.getBOOL("FreezeTime")) if (change_camera && !gSavedSettings.getBOOL("FreezeTime"))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment