summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloateremojipicker.cpp8
-rw-r--r--indra/newview/llfloateremojipicker.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index e94fc203f0..f63062f03a 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -389,11 +389,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
}
}
-bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
-{
- return std::find(descr->Categories.begin(), descr->Categories.end(), mSelectedCategory) != descr->Categories.end();
-}
-
bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
{
if (descr->Name.find(mSearchPattern) != std::string::npos)
@@ -401,9 +396,6 @@ bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
for (const std::string& shortCode : descr->ShortCodes)
if (shortCode.find(mSearchPattern) != std::string::npos)
return true;
- for (const std::string& category : descr->Categories)
- if (category.find(mSearchPattern) != std::string::npos)
- return true;
return false;
}
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index b36e09fd5b..300d9a4d4a 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -57,7 +57,6 @@ public:
private:
void fillEmojiGrid();
- bool matchesCategory(const LLEmojiDescriptor* descr);
bool matchesPattern(const LLEmojiDescriptor* descr);
void onCategoryCommit();