diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
| commit | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (patch) | |
| tree | 2949dade42fc865c5abd83854b9f04529a01c581 /indra/newview/llsidetray.cpp | |
| parent | 4f5b27c933c827b98886d6218908b83e85672e3e (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
merging beta fixes after 2.4.0-beta1
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 3f8aeaf400..9c8557c017 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -301,7 +301,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) |