diff options
| author | Andrew Productengine <adyukov@productengine.com> | 2010-11-24 19:01:01 +0200 |
|---|---|---|
| committer | Andrew Productengine <adyukov@productengine.com> | 2010-11-24 19:01:01 +0200 |
| commit | abcb3a7306f95f66aadb3db2fa8cd4000bc0a8e5 (patch) | |
| tree | c59798643f8defc54221bdcd8a2bd8970ca7fd12 /indra/newview/llsidetray.cpp | |
| parent | d7d23d16246e182c1cc74a57cac357aaa5c6c8e2 (diff) | |
STORM-375 FIXED Fixed resetting of opened accordion on minimizing/unminimizing Appearance floater.
The floater on minimization behaved the way consistent with Appearance panel in sidetray on visibility change.
- To let LLSidepanelAppearance::updateToVisibility() determine whether to reset state or not, "reset_accordion" field was added to LLSD that it passed to it. It's value is
different depending on where updateToVisibility() was called from. "visible" field was added to store boolean value that was passed before fix without name, but now can't be used that way.
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) |