diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
| commit | ed32a5e2b8e865cfad1d697fd5542b05162c40a9 (patch) | |
| tree | 36616fdac52c4149dd88204054e9cf7e1342ff87 /indra/newview/llagentcamera.cpp | |
| parent | 9c2f2b884a16d180f83e76d3ed58c949c9692eaf (diff) | |
| parent | 444311d58082ae1277a3628fbe380f7407910f50 (diff) | |
pull tags and late fixes back from viewer-pre-release
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index f01d5ff1f5..6c5c3bcdab 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -282,25 +282,22 @@ void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) gAgent.stopAutoPilot(TRUE); } - if (!gNoRender) - { - LLSelectMgr::getInstance()->unhighlightAll(); + LLSelectMgr::getInstance()->unhighlightAll(); - // By popular request, keep land selection while walking around. JC - // LLViewerParcelMgr::getInstance()->deselectLand(); + // By popular request, keep land selection while walking around. JC + // LLViewerParcelMgr::getInstance()->deselectLand(); - // force deselect when walking and attachment is selected - // this is so people don't wig out when their avatar moves without animating - if (LLSelectMgr::getInstance()->getSelection()->isAttachment()) - { - LLSelectMgr::getInstance()->deselectAll(); - } + // force deselect when walking and attachment is selected + // this is so people don't wig out when their avatar moves without animating + if (LLSelectMgr::getInstance()->getSelection()->isAttachment()) + { + LLSelectMgr::getInstance()->deselectAll(); + } - if (gMenuHolder != NULL) - { - // Hide all popup menus - gMenuHolder->hideMenus(); - } + if (gMenuHolder != NULL) + { + // Hide all popup menus + gMenuHolder->hideMenus(); } if (change_camera && !gSavedSettings.getBOOL("FreezeTime")) |