Hide chiclet bar if using Shift-Alt-U shortcut to hide the UI

Wed, 04 Apr 2018 17:25:44 +0200

author
Ansariel
date
Wed, 04 Apr 2018 17:25:44 +0200
changeset 55026
27c857bfb47a
parent 55025
7cf19cd78336
child 55027
3d83e98f3ac8

Hide chiclet bar if using Shift-Alt-U shortcut to hide the UI

indra/newview/llchicletbar.cpp file | annotate | diff | revisions
indra/newview/llviewerwindow.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llchicletbar.cpp	Mon Apr 02 20:53:24 2018 +0200
     1.2 +++ b/indra/newview/llchicletbar.cpp	Wed Apr 04 17:25:44 2018 +0200
     1.3 @@ -36,6 +36,7 @@
     1.4  // Firestorm includes
     1.5  #include "fsfloaterim.h"
     1.6  #include "llfloaterreg.h"
     1.7 +#include "llviewerwindow.h"
     1.8  
     1.9  namespace
    1.10  {
    1.11 @@ -354,6 +355,6 @@
    1.12  // <FS:Ansariel> Option to hide IM/Group chat chiclets
    1.13  void LLChicletBar::updateVisibility(const LLSD &data)
    1.14  {
    1.15 -	mChicletPanel->setVisible(!data.asBoolean());
    1.16 +	mChicletPanel->setVisible(gViewerWindow->getUIVisibility() && !data.asBoolean());
    1.17  }
    1.18  // </FS:Ansariel>
     2.1 --- a/indra/newview/llviewerwindow.cpp	Mon Apr 02 20:53:24 2018 +0200
     2.2 +++ b/indra/newview/llviewerwindow.cpp	Wed Apr 04 17:25:44 2018 +0200
     2.3 @@ -6856,6 +6856,7 @@
     2.4  	FSNearbyChat::instance().showDefaultChatBar(visible && !gSavedSettings.getBOOL("AutohideChatBar"));
     2.5  	gSavedSettings.setBOOL("FSInternalShowNavbarNavigationPanel", visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
     2.6  	gSavedSettings.setBOOL("FSInternalShowNavbarFavoritesPanel", visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
     2.7 +	mRootView->getChildView("chiclet_container")->setVisible(visible);
     2.8  	// </FS:Ansariel>
     2.9  
    2.10  	// <FS:Zi> Is done inside XUI now, using visibility_control

mercurial