diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-13 18:42:17 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-13 18:42:17 +0100 |
commit | 0389188954b2492d37deb08a30687410302751b8 (patch) | |
tree | 7117afa0581967196397e79ef1559b9a0e8ddc24 /indra/newview/llsidetray.cpp | |
parent | 807aec7bafe19fca75a8f3980bd621fad7c8338e (diff) | |
parent | baeded61a7cc281062efdecea2c8a385c619fe74 (diff) |
merge VWR-20694
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r-- | indra/newview/llsidetray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 1d32b58948..342b73d9c0 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -998,9 +998,9 @@ void LLSideTray::detachTabs() std::string floater_ctrl_name = LLFloater::getControlName("side_bar_tab", LLSD(tab->getName())); std::string vis_ctrl_name = LLFloaterReg::getVisibilityControlName(floater_ctrl_name); - if (!LLUI::sSettingGroups["floater"]->controlExists(vis_ctrl_name)) continue; + if (!LLFloater::getControlGroup()->controlExists(vis_ctrl_name)) continue; - bool is_visible = LLUI::sSettingGroups["floater"]->getBOOL(vis_ctrl_name); + bool is_visible = LLFloater::getControlGroup()->getBOOL(vis_ctrl_name); if (!is_visible) continue; llassert(isTabAttached(tab->getName())); |