diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
| commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
| tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/newview/llsidetray.cpp | |
| parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
| parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) | |
merge fixes for STORM-432
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index a4f855f279..2905e369f1 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -298,7 +298,11 @@ static void on_minimize(LLSidepanelAppearance* panel, LLSD minimized) { if (!panel) return; bool visible = !minimized.asBoolean(); - panel->updateToVisibility(LLSD(visible)); + LLSD visibility; + visibility["visible"] = visible; + // Do not reset accordion state on minimize (STORM-375) + visibility["reset_accordion"] = false; + panel->updateToVisibility(visibility); } void LLSideTrayTab::undock(LLFloater* floater_tab) |