diff options
| author | Andrew Polunin <apolunin@productengine.com> | 2010-06-21 19:27:06 +0300 |
|---|---|---|
| committer | Andrew Polunin <apolunin@productengine.com> | 2010-06-21 19:27:06 +0300 |
| commit | 525a56872f1e66651b578e59a776643352a3d523 (patch) | |
| tree | b38eaf27c1999a6c2468f4cf975a4aa15be65e20 /indra | |
| parent | a0258435ebd6cbb949b9f5acdaedf57adce78f45 (diff) | |
EXT-5808 ADDITIONAL FIX (Add coordinates and parcel settings to top menu bar when nav bar is hidden and flags are set) - fixed Mini-Location panel visibility in mouse look mode
Added code to the LLAgent::endAnimationUpdateUI() which shows/hides Mini-Location panel depending on the mouse look mode and user preferences.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/623/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llagent.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 03efcadc98..217fb0f988 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -57,6 +57,7 @@ #include "llnavigationbar.h" // to show/hide navigation bar when changing mouse look state #include "llnearbychatbar.h" #include "llnotificationsutil.h" +#include "llpaneltopinfobar.h" #include "llparcel.h" #include "llrendersphere.h" #include "llsdutil.h" @@ -1693,6 +1694,11 @@ void LLAgent::endAnimationUpdateUI() LLNavigationBar::getInstance()->setVisible(TRUE); gStatusBar->setVisibleForMouselook(true); + if (gSavedSettings.getBOOL("ShowMiniLocationPanel")) + { + LLPanelTopInfoBar::getInstance()->setVisible(TRUE); + } + LLBottomTray::getInstance()->onMouselookModeOut(); LLSideTray::getInstance()->getButtonsPanel()->setVisible(TRUE); @@ -1791,6 +1797,8 @@ void LLAgent::endAnimationUpdateUI() LLNavigationBar::getInstance()->setVisible(FALSE); gStatusBar->setVisibleForMouselook(false); + LLPanelTopInfoBar::getInstance()->setVisible(FALSE); + LLBottomTray::getInstance()->onMouselookModeIn(); LLSideTray::getInstance()->getButtonsPanel()->setVisible(FALSE); |