diff options
author | Richard Linden <none@none> | 2011-03-07 06:43:13 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-03-07 06:43:13 -0800 |
commit | f28d3a13d34937285f9d920d306896162ae91e4b (patch) | |
tree | c1259d7b1d762fde12b480aaa93074974dc09bb0 /indra/newview/llbottomtray.cpp | |
parent | 61e7c4166ffb6e16c42282d68a29365da5c62c5f (diff) | |
parent | 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r-- | indra/newview/llbottomtray.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 5d5ba03615..4645a2c6e7 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -823,6 +823,12 @@ void LLBottomTray::draw() getChild<LLButton>("show_people_button")->setToggleState(false); } + LLFloater* help_browser = (LLFloaterReg::findInstance("help_browser")); + bool help_floater_visible = (help_browser && help_browser->isInVisibleChain()); + + getChild<LLButton>("show_help_btn")->setToggleState(help_floater_visible); + + } bool LLBottomTray::onContextMenuItemEnabled(const LLSD& userdata) |