summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-08 11:42:31 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-08 11:42:31 -0700
commit605c9c19661702755171669e2af846abe77d2a51 (patch)
tree8ab3bcd992c8167c1b9bdd9af074cd8acf39bcf7 /indra/llui
parentb5055e890743783746a3691f14b81a6bc62f2bff (diff)
Fix merge fail.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llmenugl.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index aa87329020..1f11f26192 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -175,7 +175,12 @@ protected:
// This function appends the character string representation of
// the current accelerator key and mask to the provided string.
void appendAcceleratorString( std::string& st ) const;
-
+
+ virtual std::string _getSearchText() const
+ {
+ return mLabel.getString();
+ }
+
protected:
KEY mAcceleratorKey;
MASK mAcceleratorMask;