diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
| commit | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (patch) | |
| tree | d6fafbb1a084ea8b06db3d3499bd5084b7e4f7f6 /indra/newview/llfloatersidetraytab.cpp | |
| parent | 26334a4c57e58bfd13e6bbbff2298ec5ba3e77e7 (diff) | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
Merge.
Diffstat (limited to 'indra/newview/llfloatersidetraytab.cpp')
| -rw-r--r-- | indra/newview/llfloatersidetraytab.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidetraytab.cpp b/indra/newview/llfloatersidetraytab.cpp index 94407e6da0..9f15e62d84 100644 --- a/indra/newview/llfloatersidetraytab.cpp +++ b/indra/newview/llfloatersidetraytab.cpp @@ -47,5 +47,6 @@ LLFloaterSideTrayTab::~LLFloaterSideTrayTab() void LLFloaterSideTrayTab::onClose(bool app_quitting) { - LLSideTray::getInstance()->setTabDocked(getName(), true); + // The floater is already being closed, so don't toggle it once more (that may crash viewer). + LLSideTray::getInstance()->setTabDocked(getName(), /* dock = */ true, /* toggle_floater = */ false); } |