diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
| commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
| tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/newview/llfloatersidetraytab.cpp | |
| parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
| parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) | |
merge changes for storm-1064
Diffstat (limited to 'indra/newview/llfloatersidetraytab.cpp')
| -rw-r--r-- | indra/newview/llfloatersidetraytab.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatersidetraytab.cpp b/indra/newview/llfloatersidetraytab.cpp index f13b4db3a0..94407e6da0 100644 --- a/indra/newview/llfloatersidetraytab.cpp +++ b/indra/newview/llfloatersidetraytab.cpp @@ -30,6 +30,7 @@ // newview includes #include "lltransientfloatermgr.h" +#include "llsidetray.h" LLFloaterSideTrayTab::LLFloaterSideTrayTab(const LLSD& key, const Params& params) : LLFloater(key, params) @@ -43,3 +44,8 @@ LLFloaterSideTrayTab::~LLFloaterSideTrayTab() { LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this); } + +void LLFloaterSideTrayTab::onClose(bool app_quitting) +{ + LLSideTray::getInstance()->setTabDocked(getName(), true); +} |