diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
| commit | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch) | |
| tree | c4bbed389b33de9dc8fbc746bccccb6545307ad6 /indra/newview/llsidetray.cpp | |
| parent | 732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff) | |
| parent | 20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff) | |
merge fix for STORM-679
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) |