diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-07 06:53:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-07 06:53:28 -0400 |
| commit | 8cdf32aa12fb8d003169e701410458a242f636c2 (patch) | |
| tree | 1b4c6e4b451d530dd22b83e8200a6c9161938fa7 /indra/newview/llfloatersidetraytab.cpp | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
| parent | 175f12350d351570712db03e15c1bc89af677ad8 (diff) | |
merge changes for storm-1093
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); } |