FIRE-15158: Show Chat Bar icon will not go away when toolbar is cleared on Vintage and Latency skins

Sun, 14 Dec 2014 02:06:04 +0100

author
Ansariel
date
Sun, 14 Dec 2014 02:06:04 +0100
changeset 43069
c7e9c2bab2ba
parent 43068
ae61aa0cb9f0
child 43070
2b99a4a31012

FIRE-15158: Show Chat Bar icon will not go away when toolbar is cleared on Vintage and Latency skins

indra/newview/lltoolbarview.cpp file | annotate | diff | revisions
indra/newview/lltoolbarview.h file | annotate | diff | revisions
     1.1 --- a/indra/newview/lltoolbarview.cpp	Sat Dec 13 21:55:13 2014 +0100
     1.2 +++ b/indra/newview/lltoolbarview.cpp	Sun Dec 14 02:06:04 2014 +0100
     1.3 @@ -83,8 +83,9 @@
     1.4  	// <FS:Ansariel> Member variables needed for console chat bottom offset
     1.5  	//mBottomToolbarPanel(NULL)
     1.6  	mBottomToolbarPanel(NULL),
     1.7 -	mBottomChatStack(NULL)
     1.8 +	mBottomChatStack(NULL),
     1.9  	// </FS:Ansariel> Member variables needed for console chat bottom offset
    1.10 +	mHideBottomOnEmpty(false) // <FS:Ansariel> Added to determine if toolbar gets hidden when empty
    1.11  {
    1.12  	for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; i++)
    1.13  	{
    1.14 @@ -128,6 +129,11 @@
    1.15  	// <FS:Ansariel> Member variable needed for console chat bottom offset
    1.16  	mBottomChatStack = findChild<LLView>("bottom_chat_stack");
    1.17  
    1.18 +	// <FS:Ansariel> Added to determine if toolbar gets hidden when empty
    1.19 +	std::string current_skin = gSavedSettings.getString("SkinCurrent");
    1.20 +	mHideBottomOnEmpty = (current_skin == "vintage" || current_skin == "latency");
    1.21 +	// </FS:Ansariel>
    1.22 +
    1.23  	return TRUE;
    1.24  }
    1.25  
    1.26 @@ -605,7 +611,7 @@
    1.27  		mToolbars[i]->getParent()->setVisible(mShowToolbars 
    1.28  											// <FS:Ansariel> FIRE-5141: Nearby chat floater can no longer be resized when all buttons are removed from bottom FUI panel
    1.29  											//&& (mToolbars[i]->hasButtons() 
    1.30 -											&& ((i == LLToolBarEnums::TOOLBAR_BOTTOM ? true : mToolbars[i]->hasButtons())
    1.31 +											&& (((i == LLToolBarEnums::TOOLBAR_BOTTOM && !mHideBottomOnEmpty) ? true : mToolbars[i]->hasButtons())
    1.32  											// </FS:Ansariel>
    1.33  											|| isToolDragged()));
    1.34  	}
     2.1 --- a/indra/newview/lltoolbarview.h	Sat Dec 13 21:55:13 2014 +0100
     2.2 +++ b/indra/newview/lltoolbarview.h	Sun Dec 14 02:06:04 2014 +0100
     2.3 @@ -132,6 +132,9 @@
     2.4  	// <FS:Ansariel> Member variables needed for console chat bottom offset
     2.5  	LLView*				mBottomChatStack;
     2.6  	// </FS:Ansariel>
     2.7 +
     2.8 +	// <FS:Ansariel> Added to determine if toolbar gets hidden when empty
     2.9 +	bool				mHideBottomOnEmpty;
    2.10  };
    2.11  
    2.12  extern LLToolBarView* gToolBarView;

mercurial