livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-20271: Fixed crash during login after FIRE-14482 when status bar media controls are hidden

meow-7.2.2
Kadah_Coba 2016-10-25 00:24:33 -07:00
parent b834eb0052
commit 204ba40aae
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llstatusbar.cpp
View File

@ -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;
}