From 204ba40aaef64f60bd1bdc876f8398faed3dae6f Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Tue, 25 Oct 2016 00:24:33 -0700
Subject: [PATCH] FIRE-20271: Fixed crash during login after FIRE-14482 when
 status bar media controls are hidden

---
 indra/newview/llstatusbar.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 9e9bdac771..9868606b22 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -488,14 +488,6 @@ BOOL LLStatusBar::postBuild()
 	gSavedSettings.getControl("FSMenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::updateMenuSearchVisibility, this, _2));
 	// </FS:ND>
 
-	// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
-	mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft;
-	if (!gSavedSettings.getBOOL("FSEnableVolumeControls"))
-	{
-		updateVolumeControlsVisibility(LLSD(FALSE));
-	}
-	// </FS:PP>
-
 	// <FS:Ansariel> FIRE-14482: Show FPS in status bar
 	mFPSText = getChild<LLTextBox>("FPSText");
 	gSavedSettings.getControl("FSStatusBarShowFPS")->getSignal()->connect(boost::bind(&LLStatusBar::onShowFPSChanged, this, _2));
@@ -505,6 +497,14 @@ BOOL LLStatusBar::postBuild()
 	}
 	// </FS:Ansariel>
 
+	// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
+	mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft;
+	if (!gSavedSettings.getBOOL("FSEnableVolumeControls"))
+	{
+		updateVolumeControlsVisibility(LLSD(FALSE));
+	}
+	// </FS:PP>
+
 	return TRUE;
 }