diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-06-17 11:37:21 -0400 |
| commit | 4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (patch) | |
| tree | 11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/newview/llsidetray.cpp | |
| parent | 59cc637b8df9b189b2c43e2fcf588c977580f820 (diff) | |
| parent | 7cc006347822a70f36175dc2627814a0eaeb9c0a (diff) | |
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 9406f80b75..fed39c362e 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -35,6 +35,7 @@ #include "lltextbox.h" #include "llagentcamera.h" +#include "llappviewer.h" #include "llbottomtray.h" #include "llsidetray.h" #include "llviewerwindow.h" @@ -272,9 +273,18 @@ BOOL LLSideTray::postBuild() collapseSideBar(); setMouseOpaque(false); + + LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLSideTray::handleLoginComplete, this)); + return true; } +void LLSideTray::handleLoginComplete() +{ + //reset tab to "home" tab if it was changesd during login process + selectTabByName("sidebar_home"); +} + LLSideTrayTab* LLSideTray::getTab(const std::string& name) { return getChild<LLSideTrayTab>(name,false); |