diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-01-14 13:50:28 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-01-14 13:50:28 +0200 |
| commit | 127ed9c67809b5ad169fbc971e800c7744363c57 (patch) | |
| tree | eb1bc24ab94c585415e4121f72687690182da9cc | |
| parent | 9c8584a3a7562810c83dd5e2d02e42e6d6870d96 (diff) | |
SL-10352 FIXED 'Search menus' disappears after entering and exiting mouselook view
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 82087fbe5d..8f7c4601e8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11530,6 +11530,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>MenuSearch</key> + <map> + <key>Comment</key> + <string>Show/hide 'Search menus' field</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>GroupListShowIcons</key> <map> <key>Comment</key> diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index b893e4a058..f3c270a97b 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -247,11 +247,11 @@ BOOL LLStatusBar::postBuild() mFilterEdit = getChild<LLSearchEditor>( "search_menu_edit" ); mSearchPanel = getChild<LLPanel>( "menu_search_panel" ); - //mSearchPanel->setVisible(gSavedSettings.getBOOL("MenuSearch")); + mSearchPanel->setVisible(gSavedSettings.getBOOL("MenuSearch")); mFilterEdit->setKeystrokeCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this)); mFilterEdit->setCommitCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this)); collectSearchableItems(); - //gSavedSettings.getControl("MenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::updateMenuSearchVisibility, this, _2)); + gSavedSettings.getControl("MenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::updateMenuSearchVisibility, this, _2)); return TRUE; } |