diff options
author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
---|---|---|
committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/llfloatersidetraytab.cpp | |
parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) |
STORM-1019 Resolve merge conflicts
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); +} |