From 4a430585c458b2604c80c84a66988551f088087b Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Fri, 19 Dec 2025 14:52:31 +0100 Subject: [PATCH] Minor cleanup in Omnifilter Small cleanup inspired by a coversation with Zi. Remove a redundant callback and ensure the owner UUID is handled properly. Signed-off-by: PanteraPolnocy --- indra/newview/omnifilter.cpp | 3 +-- indra/newview/omnifilterengine.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/indra/newview/omnifilter.cpp b/indra/newview/omnifilter.cpp index b9cf79fd83..260111015d 100644 --- a/indra/newview/omnifilter.cpp +++ b/indra/newview/omnifilter.cpp @@ -261,7 +261,7 @@ void Omnifilter::onOwnerChanged() { static LLColor4 default_text_color = mOwnerCtrl->getFgColor(); - if (LLUUID::validate(mOwnerCtrl->getValue())) + if (LLUUID::validate(mOwnerCtrl->getValue().asString())) { mOwnerCtrl->setFgColor(default_text_color); } @@ -372,7 +372,6 @@ bool Omnifilter::postBuild() mRemoveNeedleBtn->setCommitCallback(boost::bind(&Omnifilter::onRemoveNeedleClicked, this)); mNeedleNameCtrl->setCommitCallback(boost::bind(&Omnifilter::onNeedleNameChanged, this)); mSenderNameCtrl->setCommitCallback(boost::bind(&Omnifilter::onNeedleChanged, this)); - mContentCtrl->setCommitCallback(boost::bind(&Omnifilter::onNeedleChanged, this)); mSenderCaseSensitiveCheck->setCommitCallback(boost::bind(&Omnifilter::onNeedleChanged, this)); mSenderMatchTypeCombo->setCommitCallback(boost::bind(&Omnifilter::onNeedleChanged, this)); mContentCtrl->setCommitCallback(boost::bind(&Omnifilter::onNeedleChanged, this)); diff --git a/indra/newview/omnifilterengine.cpp b/indra/newview/omnifilterengine.cpp index 263d8ba8b6..94bfb45faf 100644 --- a/indra/newview/omnifilterengine.cpp +++ b/indra/newview/omnifilterengine.cpp @@ -319,6 +319,12 @@ void OmnifilterEngine::loadNeedles() new_needle.mSenderNameCaseInsensitive = needle_data["sender_name_case_insensitive"].asBoolean(); new_needle.mContentCaseInsensitive = needle_data["content_case_insensitive"].asBoolean(); + const std::string owner_id_str = needle_data["owner_id"].asString(); + if (!owner_id_str.empty()) + { + new_needle.mOwnerID.set(owner_id_str); + } + mNeedles[new_needle_name] = new_needle; } }