diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
| commit | 91956a0f44bb6a15e4af58dd328e1a0c5bbc0553 (patch) | |
| tree | aac58db318246305e39d0253c1db664b4913126b /indra/newview/llfloatersidetraytab.cpp | |
| parent | 3039663148b0adc64220964b10cad595e5137cc0 (diff) | |
| parent | e1f2b2b3e82a2415abe9d2c0e548319284e0f2bf (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); } |