Merge branch 'master' into DRTVWR-486

# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelvolume.h

1 files changed, 43 insertions, 9 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 6bf2136f60..82f01fb747 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -263,7 +263,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mGotPersonalInfo(false),
 	mOriginalIMViaEmail(false),
 	mLanguageChanged(false),
-	mAvatarDataInitialized(false)
+	mAvatarDataInitialized(false),
+	mSearchDataDirty(true)
 {
 	LLConversationLog::instance().addObserver(this);
 
@@ -2150,6 +2151,11 @@ void LLFloaterPreference::updateClickActionViews()
 	getChild<LLComboBox>("double_click_action_combo")->setValue(dbl_click_to_teleport ? 2 : (int)dbl_click_to_walk);
 }
 
+void LLFloaterPreference::updateSearchableItems()
+{
+    mSearchDataDirty = true;
+}
+
 void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
 {
 	LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
@@ -2332,7 +2338,7 @@ BOOL LLPanelPreference::postBuild()
 	}
 
 	//////////////////////PanelSetup ///////////////////
-	if (hasChild("max_bandwidth"), TRUE)
+	if (hasChild("max_bandwidth", TRUE))
 	{
 		mBandWidthUpdater = new LLPanelPreference::Updater(boost::bind(&handleBandwidthChanged, _1), BANDWIDTH_UPDATER_TIMEOUT);
 		gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&LLPanelPreference::Updater::update, mBandWidthUpdater, _2));
@@ -2906,10 +2912,19 @@ void LLPanelPreferenceControls::populateControlTable()
         filename = "control_table_contents_columns_basic.xml";
         break;
     default:
-        // Either unknown mode or MODE_SAVED_SETTINGS
-        // It doesn't have UI or actual settings yet
-        LL_INFOS() << "Unimplemented mode" << LL_ENDL;
-        return;
+        {
+            // Either unknown mode or MODE_SAVED_SETTINGS
+            // It doesn't have UI or actual settings yet
+            LL_WARNS() << "Unimplemented mode" << LL_ENDL;
+
+            // Searchable columns were removed, mark searchables for an update
+            LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+            if (instance)
+            {
+                instance->updateSearchableItems();
+            }
+            return;
+        }
     }
     addControlTableColumns(filename);
 
@@ -2940,8 +2955,15 @@ void LLPanelPreferenceControls::populateControlTable()
     }
     else
     {
-        LL_INFOS() << "Unimplemented mode" << LL_ENDL;
-        return;
+        LL_WARNS() << "Unimplemented mode" << LL_ENDL;
+    }
+
+    // Searchable columns were removed and readded, mark searchables for an update
+    // Note: at the moment tables/lists lack proper llsearchableui support
+    LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+    if (instance)
+    {
+        instance->updateSearchableItems();
     }
 }
 
@@ -3184,7 +3206,12 @@ void LLPanelPreferenceControls::setKeyBind(const std::string &control, EMouseCli
                 break;
             }
         }
-        mConflictHandler[mode].registerControl(control, index, click, key, mask, true);
+        // At the moment 'ignore_mask' mask is mostly ignored, a placeholder
+        // Todo: implement it since it's preferable for things like teleport to match
+        // mask exactly but for things like running to ignore additional masks
+        // Ideally this needs representation in keybindings UI
+        bool ignore_mask = true;
+        mConflictHandler[mode].registerControl(control, index, click, key, mask, ignore_mask);
     }
     else if (!set)
     {
@@ -3559,6 +3586,12 @@ void LLFloaterPreference::onUpdateFilterTerm(bool force)
 	if( !mSearchData || (mSearchData->mLastFilter == seachValue && !force))
 		return;
 
+    if (mSearchDataDirty)
+    {
+        // Data exists, but is obsolete, regenerate
+        collectSearchableItems();
+    }
+
 	mSearchData->mLastFilter = seachValue;
 
 	if( !mSearchData->mRootTab )
@@ -3656,4 +3689,5 @@ void LLFloaterPreference::collectSearchableItems()
 
 		collectChildren( this, ll::prefs::PanelDataPtr(), pRootTabcontainer );
 	}
+	mSearchDataDirty = false;
 }