diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-03 11:53:31 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-03 11:53:31 -0800 |
| commit | 6496e5877b0996353496101433bb9154926fef8b (patch) | |
| tree | f75bf4fca9d150593e1ad3623cc26364d527e040 /indra/newview/llfloatersocial.cpp | |
| parent | 542864f8ea9bb5602ac76553d76898178ad79d0f (diff) | |
| parent | bf86275d78b041faffc646195bc16ecabaa3bdb7 (diff) | |
Pull merge from viewer-acme
Diffstat (limited to 'indra/newview/llfloatersocial.cpp')
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index 2a74c8e3ea..31404da7d3 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -46,6 +46,7 @@ #include "llviewerregion.h" #include "llviewercontrol.h" #include "llviewermedia.h" +#include "lltabcontainer.h" static LLRegisterPanelClassWrapper<LLSocialStatusPanel> t_panel_status("llsocialstatuspanel"); static LLRegisterPanelClassWrapper<LLSocialPhotoPanel> t_panel_photo("llsocialphotopanel"); @@ -823,6 +824,18 @@ BOOL LLFloaterSocial::postBuild() return LLFloater::postBuild(); } +void LLFloaterSocial::showPhotoPanel() +{ + LLTabContainer* parent = dynamic_cast<LLTabContainer*>(mSocialPhotoPanel->getParent()); + if (!parent) + { + llwarns << "Cannot find panel container" << llendl; + return; + } + + parent->selectTabPanel(mSocialPhotoPanel); +} + // static void LLFloaterSocial::preUpdate() { |