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

Fix QuickPrefs floater sometimes being unmovable if toolbar button gets removed

Ansariel 2015-02-27 13:44:02 +01:00
parent fc971a2c8f
commit 37192dc2d6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lltoolbarview.cpp
View File

@ -604,6 +604,8 @@ void LLToolBarView::onToolBarButtonRemoved(LLView* button)
FloaterQuickPrefs* quickprefs_floater = LLFloaterReg::getTypedInstance<FloaterQuickPrefs>("quickprefs");
if (quickprefs_floater && quickprefs_floater->isShown())
{
quickprefs_floater->setUseTongue(false);
quickprefs_floater->setDocked(false, false);
quickprefs_floater->setCanDock(false);
LLDockControl* dock_control = quickprefs_floater->getDockControl();
dock_control->setDock(NULL);

3
indra/newview/quickprefs.cpp
View File

@ -1915,7 +1915,8 @@ void FloaterQuickPrefs::dockToToolbarButton()
else
{
setUseTongue(false);
setDockControl(NULL);
setDocked(false, false);
setCanDock(false);
setDockControl(NULL);
}
}