diff options
author | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
commit | fdf63ba0753fcfc17aa6939836c7835787293b3c (patch) | |
tree | cd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /indra/newview/llviewermenu.cpp | |
parent | 501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff) | |
parent | 9c82ea334ab0c1283f28997fe060b24200e3e2be (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ec72df79d1..64338d4417 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -867,7 +867,6 @@ void toggle_destination_and_avatar_picker(const LLSD& show) LLFirstUse::notUsingDestinationGuide(false); avatar_btn->setToggleState(false); destination_btn->setToggleState(true); - return; } break; case 1: @@ -878,18 +877,17 @@ void toggle_destination_and_avatar_picker(const LLSD& show) avatar_picker->setVisible(true); avatar_btn->setToggleState(true); destination_btn->setToggleState(false); - return; } break; default: - break; - } - container->setVisible(false); destinations->setVisible(false); avatar_picker->setVisible(false); avatar_btn->setToggleState(false); destination_btn->setToggleState(false); + break; + } + gSavedSettings.setS32("DestinationsAndAvatarsVisibility", panel_idx); }; |