diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
| commit | dc2dadbbe62764a2b455e8ac6657407bad9bbd6d (patch) | |
| tree | 667776f36e74485200d8ae08359f7468f9621f25 /indra/newview/llbottomtray.cpp | |
| parent | c598b41c590ccd5965567f6f028747a02e597567 (diff) | |
| parent | 4ac6eed116a888e113d6f4f031e57e09a141b55a (diff) | |
Pull from sergeylproductengine/viewer-experience-fui/
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 55c63edd74..98712f1334 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -31,6 +31,7 @@ // library includes #include "llfloaterreg.h" +#include "llfloatersidepanelcontainer.h" #include "llflyoutbutton.h" #include "lllayoutstack.h" #include "llnotifications.h" @@ -47,7 +48,6 @@ #include "llimfloater.h" // for LLIMFloater #include "llnearbychatbar.h" #include "llnearbychatbarlistener.h" -#include "llsidetray.h" #include "llspeakbutton.h" #include "llsplitbutton.h" #include "llsyswellwindow.h" @@ -858,7 +858,7 @@ void LLBottomTray::draw() } getChild<LLButton>("show_profile_btn")->setToggleState(LLAvatarActions::profileVisible(gAgent.getID())); - LLPanel* panel = LLSideTray::getInstance()->getPanel("panel_people"); + LLPanel* panel = LLFloaterSidePanelContainer::getPanel("people", "panel_people"); if (panel && panel->isInVisibleChain()) { getChild<LLButton>("show_people_button")->setToggleState(true); |