diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-01 12:17:25 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-01 12:17:25 +0300 |
| commit | 4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (patch) | |
| tree | aa69d13d4729ad6e732a0c9f5af8aad74f963e49 | |
| parent | 4a4cdd3775114346c6bc7c7a368d412fd78911d5 (diff) | |
EXT-7379 FIXED Add save_visibility=true to search floater to enable interaction with Search button
Also added reset of floaters visibility on exit to emulate save_visibility=false
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/463/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index a057421135..ff1e8a9657 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -198,6 +198,12 @@ LLBottomTray::~LLBottomTray() S32 custom_width = mNearbyChatBar->getRect().getWidth(); gSavedSettings.setS32("ChatBarCustomWidth", custom_width); } + + // emulate previous floater behavior to be hidden on startup. + // override effect of save_visibility=true. + // this attribute is necessary to button.initial_callback=Button.SetFloaterToggle works properly: + // i.g when floater changes its visibility - button changes its toggle state. + getChild<LLUICtrl>("search_btn")->setControlValue(false); } // *TODO Vadim: why void* ? diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 9ca18d455b..49b3b58113 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -9,6 +9,7 @@ name="floater_search" help_topic="floater_search" save_rect="true" + save_visibility="true" single_instance="true" title="FIND" width="650"> |