diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 8e21ce4d54..43a7cd6b3b 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -415,7 +415,10 @@ private:
protected:
virtual std::string _getSearchText() const override
{
- return getLabelUnselected() + getToolTip();
+ // Look in name attributes, making search independent from localization
+ // return getLabelUnselected() + getToolTip();
+ return getLabelUnselected() + getToolTip() + getName();
+ //
}
};
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 0cde54326f..4d138b6156 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -143,7 +143,10 @@ private:
protected:
virtual std::string _getSearchText() const
{
- return getLabel() + getToolTip();
+ // Look in name attributes, making search independent from localization
+ // return getLabel() + getToolTip();
+ return getLabel() + getToolTip() + getName();
+ //
}
virtual void onSetHighlight() const // When highlight, really do highlight the label
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index fdfa0aa45a..a704527568 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1220,7 +1220,10 @@ std::string LLComboBox::_getSearchText() const
iter++;
}
}
- return res + getToolTip();
+ // Look in name attributes, making search independent from localization
+ // return res + getToolTip();
+ return res + getToolTip() + getName();
+ //
}
//virtual
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
index 311377a61f..30b03c6e3d 100644
--- a/indra/llui/llsliderctrl.h
+++ b/indra/llui/llsliderctrl.h
@@ -140,7 +140,10 @@ protected:
std::string strLabel;
if( mLabelBox )
strLabel = mLabelBox->getLabel();
- return strLabel + getToolTip();
+ // Look in name attributes, making search independent from localization
+ // return strLabel + getToolTip();
+ return strLabel + getToolTip() + getName();
+ //
}
virtual void onSetHighlight() const // When highlight, really do highlight the label
{
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 6d12190981..0282174607 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -728,7 +728,10 @@ protected:
// virtual
std::string _getSearchText() const override
{
- return mLabel.getString() + getToolTip();
+ // Look in name attributes, making search independent from localization
+ // return mLabel.getString() + getToolTip();
+ return mLabel.getString() + getToolTip() + getName();
+ //
}
std::vector getSelectionRects();
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4637c807af..dde130a6b7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2253,7 +2253,7 @@
Type
U32
Value
- 120
+ 60
BackgroundYieldTime
FSSoundCacheLocation
+ FSShowWhitelistReminder
+
FSLimitTextureVRAMUsage