From a10f0d1db1dcc763c2c85b7e721d9683c26423c7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 1 Nov 2021 14:45:32 -0400
Subject: [PATCH] Fast LLMuteList singleton access
---
indra/newview/llavataractions.cpp | 12 +++----
indra/newview/llblocklist.cpp | 2 +-
indra/newview/llconversationmodel.cpp | 2 +-
indra/newview/llfloaterimcontainer.cpp | 4 +--
indra/newview/llimprocessing.cpp | 18 +++++-----
indra/newview/llimview.cpp | 24 +++++++-------
indra/newview/llmutelist.cpp | 2 +-
indra/newview/llmutelist.h | 2 +-
indra/newview/lloutputmonitorctrl.cpp | 2 +-
indra/newview/llselectmgr.cpp | 2 +-
indra/newview/lltoastnotifypanel.cpp | 2 +-
indra/newview/lltoolpie.cpp | 8 ++---
indra/newview/llviewermedia.cpp | 13 +++++---
indra/newview/llviewermenu.cpp | 32 +++++++++---------
indra/newview/llviewermessage.cpp | 46 +++++++++++++-------------
indra/newview/llvoicevivox.cpp | 6 ++--
16 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 600e45d4bbc..0e7ffbc90c8 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -1165,14 +1165,14 @@ bool LLAvatarActions::toggleBlock(const LLUUID& id)
LLMute mute(id, av_name.getUserName(), LLMute::AGENT);
- if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName))
+ if (LLMuteList::getInstanceFast()->isMuted(mute.mID, mute.mName))
{
- LLMuteList::getInstance()->remove(mute);
+ LLMuteList::getInstanceFast()->remove(mute);
return false;
}
else
{
- LLMuteList::getInstance()->add(mute);
+ LLMuteList::getInstanceFast()->add(mute);
return true;
}
}
@@ -1183,7 +1183,7 @@ void LLAvatarActions::toggleMute(const LLUUID& id, U32 flags)
LLAvatarName av_name;
LLAvatarNameCache::get(id, &av_name);
- LLMuteList* mute_list = LLMuteList::getInstance();
+ LLMuteList* mute_list = LLMuteList::getInstanceFast();
bool is_muted = mute_list->isMuted(id, flags);
LLMute mute(id, av_name.getUserName(), LLMute::AGENT);
@@ -1510,13 +1510,13 @@ bool LLAvatarActions::isBlocked(const LLUUID& id)
{
LLAvatarName av_name;
LLAvatarNameCache::get(id, &av_name);
- return LLMuteList::getInstance()->isMuted(id, av_name.getUserName());
+ return LLMuteList::getInstanceFast()->isMuted(id, av_name.getUserName());
}
// static
bool LLAvatarActions::isVoiceMuted(const LLUUID& id)
{
- return LLMuteList::getInstance()->isMuted(id, LLMute::flagVoiceChat);
+ return LLMuteList::getInstanceFast()->isMuted(id, LLMute::flagVoiceChat);
}
// static
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp
index 1eab2d8e232..05e71d75bbf 100644
--- a/indra/newview/llblocklist.cpp
+++ b/indra/newview/llblocklist.cpp
@@ -80,7 +80,7 @@ LLBlockList::~LLBlockList()
void LLBlockList::createList()
{
- std::vector<LLMute> mutes = LLMuteList::instance().getMutes();
+ std::vector<LLMute> mutes = LLMuteList::instanceFast().getMutes();
std::vector<LLMute>::const_iterator mute_it = mutes.begin();
for (; mute_it != mutes.end(); ++mute_it)
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index bc107a60286..10cafa760a5 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -650,7 +650,7 @@ void LLConversationItemParticipant::setDisplayModeratorRole(bool displayRole)
bool LLConversationItemParticipant::isVoiceMuted()
{
- return mIsModeratorMuted || LLMuteList::getInstance()->isMuted(mUUID, LLMute::flagVoiceChat);
+ return mIsModeratorMuted || LLMuteList::getInstanceFast()->isMuted(mUUID, LLMute::flagVoiceChat);
}
//
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index a542d01fc98..a9c5e3db631 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1639,11 +1639,11 @@ bool LLFloaterIMContainer::checkContextMenuItem(const std::string& item, uuid_ve
{
if ("is_blocked" == item)
{
- return LLMuteList::getInstance()->isMuted(uuids.front(), LLMute::flagVoiceChat);
+ return LLMuteList::getInstanceFast()->isMuted(uuids.front(), LLMute::flagVoiceChat);
}
else if (item == "is_muted")
{
- return LLMuteList::getInstance()->isMuted(uuids.front(), LLMute::flagTextChat);
+ return LLMuteList::getInstanceFast()->isMuted(uuids.front(), LLMute::flagTextChat);
}
else if ("is_allowed_text_chat" == item)
{
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 9dd8bfa8900..b9c7253c2a4 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -184,8 +184,8 @@ void inventory_offer_handler(LLOfferInfo* info)
// If muted, don't even go through the messaging stuff. Just curtail the offer here.
// Passing in a null UUID handles the case of where you have muted one of your own objects by_name.
// The solution for STORM-1297 seems to handle the cases where the object is owned by someone else.
- if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) ||
- LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName))
+ if (LLMuteList::getInstanceFast()->isMuted(info->mFromID, info->mFromName) ||
+ LLMuteList::getInstanceFast()->isMuted(LLUUID::null, info->mFromName))
{
info->forceResponse(IOR_MUTE);
return;
@@ -494,14 +494,14 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
name = clean_name_from_im(name, dialog);
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
- BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
+ BOOL is_muted = LLMuteList::getInstanceFast()->isMuted(from_id, name, LLMute::flagTextChat)
// object IMs contain sender object id in session_id (STORM-1209)
- || (dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id));
+ || (dialog == IM_FROM_TASK && LLMuteList::getInstanceFast()->isMuted(session_id));
BOOL is_owned_by_me = FALSE;
BOOL is_friend = (LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL) ? false : true;
BOOL accept_im_from_only_friend = gSavedPerAccountSettings.getBOOL("VoiceCallsFriendsOnly");
BOOL is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
- LLMuteList::getInstance()->isLinden(name);
+ LLMuteList::isLinden(name);
chat.mMuted = is_muted;
chat.mFromID = from_id;
@@ -636,7 +636,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
// Don't block offline IMs, or IMs from Lindens
- if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!RlvActions::canReceiveIM(from_id)) && (!LLMuteList::getInstance()->isLinden(original_name) ))
+ if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!RlvActions::canReceiveIM(from_id)) && (!LLMuteList::isLinden(original_name) ))
{
if (!mute_im)
RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RlvStringKeys::Blocked::RecvImRemote), session_id);
@@ -804,7 +804,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
}
}
- if (agent_id.notNull() && LLMuteList::getInstance()->isMuted(agent_id))
+ if (agent_id.notNull() && LLMuteList::getInstanceFast()->isMuted(agent_id))
{
break;
}
@@ -886,7 +886,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
// group is not blocked, but we still need to check agent that sent the invitation
// and we have no agent's id
// Note: server sends username "first.last".
- is_muted |= LLMuteList::getInstance()->isMuted(name);
+ is_muted |= LLMuteList::getInstanceFast()->isMuted(name);
}
if (is_do_not_disturb || is_muted)
{
@@ -1675,7 +1675,7 @@ void LLIMProcessing::requestOfflineMessages()
if (!requested
&& gMessageSystem
&& !gDisconnected
- && LLMuteList::getInstance()->isLoaded()
+ && LLMuteList::getInstanceFast()->isLoaded()
&& isAgentAvatarValid()
&& gAgent.getRegion()
&& gAgent.getRegion()->capabilitiesReceived())
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 068728ba45d..2a3ed7da261 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -314,7 +314,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg)
|| NOT_ON_TOP == conversations_floater_status))
|| is_dnd_msg)
{
- if(!LLMuteList::getInstance()->isMuted(participant_id))
+ if(!LLMuteList::getInstanceFast()->isMuted(participant_id))
{
if(gAgent.isDoNotDisturb())
{
@@ -343,7 +343,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg)
&& !is_session_focused
&& !is_dnd_msg) //prevent flashing FUI button because the conversation floater will have already opened
{
- if(!LLMuteList::getInstance()->isMuted(participant_id))
+ if(!LLMuteList::getInstanceFast()->isMuted(participant_id))
{
if(!gAgent.isDoNotDisturb())
{
@@ -1457,7 +1457,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
}
// If there is a mute list and this is not a group chat...
- if ( LLMuteList::getInstance() && !is_group_chat)
+ if ( LLMuteList::instanceExists() && !is_group_chat)
{
// ... the target should not be in our mute list for some message types.
// Auto-remove them if present.
@@ -1473,7 +1473,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text,
case IM_LURE_USER:
case IM_GODLIKE_LURE_USER:
case IM_FRIENDSHIP_OFFERED:
- LLMuteList::getInstance()->autoRemove(other_participant_id, LLMuteList::AR_IM);
+ LLMuteList::getInstanceFast()->autoRemove(other_participant_id, LLMuteList::AR_IM);
break;
default: ; // do nothing
}
@@ -2737,7 +2737,7 @@ void LLIMMgr::addMessage(
// name_is_setted = true;
}
// bool skip_message = false;
-// bool from_linden = LLMuteList::getInstance()->isLinden(from);
+// bool from_linden = LLMuteList::isLinden(from);
// if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && !from_linden)
// {
// // Evaluate if we need to skip this message when that setting is true (default is false)
@@ -2819,7 +2819,7 @@ void LLIMMgr::addMessage(
// if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
// [SL:KB] - Patch: Chat-Misc | Checked: 2014-05-01 (Catznip-3.6)
- if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat))
+ if (!LLMuteList::getInstanceFast()->isMuted(other_participant_id, LLMute::flagTextChat))
// [/SL:KB]
{
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
@@ -3110,7 +3110,7 @@ void LLIMMgr::inviteToSession(
std::string question_type = "VoiceInviteQuestionDefault";
BOOL voice_invite = FALSE;
- bool is_linden = LLMuteList::getInstance()->isLinden(caller_name);
+ bool is_linden = LLMuteList::isLinden(caller_name);
// [SL:KB] - Patch: Chat-GroupOptions | Checked: Catznip-5.2
bool is_adhoc = false;
// [/SL:KB]
@@ -3162,14 +3162,14 @@ void LLIMMgr::inviteToSession(
//ignore invites from muted residents
if (!is_linden)
{
- if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagVoiceChat)
+ if (LLMuteList::getInstanceFast()->isMuted(caller_id, LLMute::flagVoiceChat)
&& voice_invite && "VoiceInviteQuestionDefault" == question_type)
{
LL_INFOS("IMVIEW") << "Rejecting voice call from initiating muted resident " << caller_name << LL_ENDL;
LLIncomingCallDialog::processCallResponse(1, payload);
return;
}
- else if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagAll & ~LLMute::flagVoiceChat) && !voice_invite)
+ else if (LLMuteList::getInstanceFast()->isMuted(caller_id, LLMute::flagAll & ~LLMute::flagVoiceChat) && !voice_invite)
{
LL_INFOS("IMVIEW") << "Rejecting session invite from initiating muted resident " << caller_name << LL_ENDL;
return;
@@ -3577,7 +3577,7 @@ void LLIMMgr::noteMutedUsers(const LLUUID& session_id,
const std::vector<LLUUID>& ids)
{
// Don't do this if we don't have a mute list.
- LLMuteList *ml = LLMuteList::getInstance();
+ LLMuteList *ml = LLMuteList::getInstanceFast();
if( !ml )
{
return;
@@ -3800,7 +3800,7 @@ class LLViewerChatterBoxInvitation : public LLHTTPNode
BOOL is_do_not_disturb = gAgent.isDoNotDisturb();
// [SL:KB] - Patch: Chat-GroupOptions | Checked: 2012-06-21 (Catznip-3.3)
- BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, LLMute::flagTextChat);
+ BOOL is_muted = LLMuteList::getInstanceFast()->isMuted(from_id, LLMute::flagTextChat);
BOOL is_group = gAgent.isInGroup(session_id);
// Just return if the user is currently marked DnD or if the group session was started by someone on the mute list (we'll get another invitation later)
@@ -3897,7 +3897,7 @@ class LLViewerChatterBoxInvitation : public LLHTTPNode
ll_vector3_from_sd(message_params["position"]),
true);
- if (LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat))
+ if (LLMuteList::getInstanceFast()->isMuted(from_id, name, LLMute::flagTextChat))
{
return;
}
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 7ffc08483ca..fb7bf7c2146 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -192,7 +192,7 @@ void LLMuteList::cleanupSingleton()
LLAvatarNameCache::getInstance()->setAccountNameChangedCallback(NULL);
}
-BOOL LLMuteList::isLinden(const std::string& name) const
+BOOL LLMuteList::isLinden(const std::string& name)
{
std::string username = boost::replace_all_copy(name, ".", " ");
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index c408b5c7d54..32b45a836f8 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -104,7 +104,7 @@ class LLMuteList final : public LLSingleton<LLMuteList>
// Alternate (convenience) form for places we don't need to pass the name, but do need flags
BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
- BOOL isLinden(const std::string& name) const;
+ static BOOL isLinden(const std::string& name);
BOOL isLoaded() const { return mIsLoaded; }
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 7129641c20a..e9c07fb8b4d 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -306,7 +306,7 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& s
else
{
// check only blocking on voice. EXT-3542
- mIsMuted = LLMuteList::getInstance()->isMuted(mSpeakerId, LLMute::flagVoiceChat);
+ mIsMuted = LLMuteList::getInstanceFast()->isMuted(mSpeakerId, LLMute::flagVoiceChat);
LLMuteList::getInstance()->addObserver(this);
}
}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d29eddbd1d3..f09f5b6d738 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5554,7 +5554,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
else if (request_flags & OBJECT_PAY_REQUEST)
{
// check if the owner of the paid object is muted
- LLMuteList::getInstance()->autoRemove(owner_id, LLMuteList::AR_MONEY);
+ LLMuteList::getInstanceFast()->autoRemove(owner_id, LLMuteList::AR_MONEY);
}
// Now look through all of the hovered nodes
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 024f25bc98a..f64fe056631 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -329,7 +329,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
mTextBox->setContentTrusted(is_content_trusted);
mTextBox->setValue(mNotification->getMessage());
mTextBox->setIsFriendCallback(LLAvatarActions::isFriend);
- mTextBox->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstance(), _1, _2, 0));
+ mTextBox->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstanceFast(), _1, _2, 0));
// add buttons for a script notification
if (mIsTip)
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c7053062fb5..c6902f9b692 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1950,7 +1950,7 @@ BOOL LLToolPie::handleRightClickPick()
LLVOAvatar* avatar = (LLVOAvatar*)object;
std::string name = avatar->getFullname();
std::string mute_msg;
- if (LLMuteList::getInstance()->isMuted(avatar->getID(), avatar->getFullname()))
+ if (LLMuteList::getInstanceFast()->isMuted(avatar->getID(), avatar->getFullname()))
{
mute_msg = LLTrans::getString("UnmuteAvatar");
}
@@ -1961,7 +1961,7 @@ BOOL LLToolPie::handleRightClickPick()
// [RLVa:KB] - Checked: 2010-04-11 (RLVa-1.2.0e) | Modified: RLVa-1.1.0l
// Don't show the context menu on empty selection when fartouch restricted [see LLToolSelect::handleObjectSelection()]
- if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ||
+ if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstanceFast()->getSelection()->isEmpty()) ||
(!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) )
{
// [/RLVa:KB]
@@ -1991,7 +1991,7 @@ BOOL LLToolPie::handleRightClickPick()
{
// BUG: What about chatting child objects?
std::string name;
- LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+ LLSelectNode* node = LLSelectMgr::getInstanceFast()->getSelection()->getFirstRootNode();
if (node)
{
name = node->mName;
@@ -2000,7 +2000,7 @@ BOOL LLToolPie::handleRightClickPick()
// [RLVa:KB] - Checked: 2010-04-11 (RLVa-1.2.el) | Modified: RLVa-1.1.0l
// Don't show the pie menu on empty selection when fartouch/interaction restricted
// (not entirely accurate in case of Tools / Select Only XXX [see LLToolSelect::handleObjectSelection()]
- if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ||
+ if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstanceFast()->getSelection()->isEmpty()) ||
(!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) )
{
// [/RLVa:KB]
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 0a4d3f07786..7d02e92f513 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -3634,27 +3634,30 @@ void LLViewerMediaImpl::calculateInterest()
// Check all objects this instance is associated with, and those objects' owners, against the mute list
mIsMuted = false;
+ bool mutelist_exists = LLMuteList::instanceExists();
+ bool selectmgr_exists = LLSelectMgr::instanceExists();
+
std::list< LLVOVolume* >::iterator iter = mObjectList.begin() ;
for(; iter != mObjectList.end() ; ++iter)
{
LLVOVolume *obj = *iter;
llassert(obj);
if (!obj) continue;
- if(LLMuteList::instanceExists() &&
- LLMuteList::getInstance()->isMuted(obj->getID()))
+ if(mutelist_exists &&
+ LLMuteList::getInstanceFast()->isMuted(obj->getID()))
{
mIsMuted = true;
}
else
{
// We won't have full permissions data for all objects. Attempt to mute objects when we can tell their owners are muted.
- if (LLSelectMgr::instanceExists())
+ if (selectmgr_exists)
{
LLPermissions* obj_perm = LLSelectMgr::getInstanceFast()->findObjectPermissions(obj);
if(obj_perm)
{
- if(LLMuteList::getInstance() &&
- LLMuteList::getInstance()->isMuted(obj_perm->getOwner()))
+ if(mutelist_exists &&
+ LLMuteList::getInstanceFast()->isMuted(obj_perm->getOwner()))
mIsMuted = true;
}
}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 38f269a957e..53dba222340 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3173,7 +3173,8 @@ BOOL enable_has_attachments(void*)
bool enable_object_mute()
{
- LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+ LLObjectSelectionHandle selection = LLSelectMgr::getInstanceFast()->getSelection();
+ LLViewerObject* object = selection->getPrimaryObject();
if (!object) return false;
LLVOAvatar* avatar = find_avatar_from_object(object);
@@ -3192,14 +3193,15 @@ bool enable_object_mute()
else
{
// Just a regular object
- return LLSelectMgr::getInstance()->getSelection()->contains( object, SELECT_ALL_TES ) &&
- !LLMuteList::getInstance()->isMuted(object->getID());
+ return selection->contains( object, SELECT_ALL_TES ) &&
+ !LLMuteList::getInstanceFast()->isMuted(object->getID());
}
}
bool enable_object_unmute()
{
- LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+ LLObjectSelectionHandle selection = LLSelectMgr::getInstanceFast()->getSelection();
+ LLViewerObject* object = selection->getPrimaryObject();
if (!object) return false;
LLVOAvatar* avatar = find_avatar_from_object(object);
@@ -3215,8 +3217,8 @@ bool enable_object_unmute()
else
{
// Just a regular object
- return LLSelectMgr::getInstance()->getSelection()->contains( object, SELECT_ALL_TES ) &&
- LLMuteList::getInstance()->isMuted(object->getID());;
+ return selection->contains( object, SELECT_ALL_TES ) &&
+ LLMuteList::getInstanceFast()->isMuted(object->getID());;
}
}
@@ -3293,7 +3295,7 @@ class LLObjectMute : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
- LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+ LLViewerObject* object = LLSelectMgr::getInstanceFast()->getSelection()->getPrimaryObject();
if (!object) return true;
LLUUID id;
@@ -3326,7 +3328,7 @@ class LLObjectMute : public view_listener_t
// it's an object
id = object->getID();
- LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+ LLSelectNode* node = LLSelectMgr::getInstanceFast()->getSelection()->getFirstRootNode();
if (node)
{
name = node->mName;
@@ -3336,13 +3338,13 @@ class LLObjectMute : public view_listener_t
}
LLMute mute(id, name, type);
- if (LLMuteList::getInstance()->isMuted(mute.mID))
+ if (LLMuteList::getInstanceFast()->isMuted(mute.mID))
{
- LLMuteList::getInstance()->remove(mute);
+ LLMuteList::getInstanceFast()->remove(mute);
}
else
{
- LLMuteList::getInstance()->add(mute);
+ LLMuteList::getInstanceFast()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);
}
@@ -6888,7 +6890,7 @@ class LLMuteParticle : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
- LLUUID id = LLToolPie::getInstance()->getPick().mParticleOwnerID;
+ LLUUID id = LLToolPie::getInstanceFast()->getPick().mParticleOwnerID;
if (id.notNull())
{
@@ -6896,13 +6898,13 @@ class LLMuteParticle : public view_listener_t
LLAvatarNameCache::get(id, &av_name);
LLMute mute(id, av_name.getUserName(), LLMute::AGENT);
- if (LLMuteList::getInstance()->isMuted(mute.mID))
+ if (LLMuteList::getInstanceFast()->isMuted(mute.mID))
{
- LLMuteList::getInstance()->remove(mute);
+ LLMuteList::getInstanceFast()->remove(mute);
}
else
{
- LLMuteList::getInstance()->add(mute);
+ LLMuteList::getInstanceFast()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);
}
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f2a55e37052..9d4cd26a0b3 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1586,7 +1586,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
LLMute::EType mute_type = is_group ? LLMute::GROUP : LLMute::AGENT;
LLMute mute(blocked_id, full_name, mute_type);
- if (LLMuteList::getInstance()->add(mute))
+ if (LLMuteList::getInstanceFast()->add(mute))
{
LLPanelBlockedList::showPanelAndSelect(blocked_id);
}
@@ -1921,7 +1921,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
log_message = LLTrans::getString("InvOfferDecline", log_message_args);
}
chat.mText = log_message;
- if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) ) // muting for SL-42269
+ if( LLMuteList::getInstanceFast()->isMuted(mFromID ) && ! LLMuteList::isLinden(mFromName) ) // muting for SL-42269
{
chat.mMuted = TRUE;
accept_to_trash = false; // will send decline message
@@ -2130,7 +2130,7 @@ bool LLOfferInfo::inventory_task_offer_callback(const LLSD& notification, const
default:
// close button probably (or any of the fall-throughs from above)
destination = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
- if (accept && LLMuteList::getInstance()->isMuted(mFromID, mFromName))
+ if (accept && LLMuteList::getInstanceFast()->isMuted(mFromID, mFromName))
{
// Note: muted offers are usually declined automatically,
// but user can mute object after receiving message
@@ -2472,7 +2472,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
if(!source_name.empty())
{
if (gAgent.isDoNotDisturb()
- || LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
+ || LLMuteList::getInstanceFast()->isMuted(source_id, source_name, LLMute::flagTextChat))
{
// automatically decline offer
LLNotifications::instance().forceResponse(LLNotification::Params("OfferCallingCard").payload(payload), 1);
@@ -2585,13 +2585,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
BOOL is_muted = FALSE;
BOOL is_linden = FALSE;
- is_muted = LLMuteList::getInstance()->isMuted(
+ is_muted = LLMuteList::getInstanceFast()->isMuted(
from_id,
from_name,
LLMute::flagTextChat)
- || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
+ || LLMuteList::getInstanceFast()->isMuted(owner_id, LLMute::flagTextChat);
is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
- LLMuteList::getInstance()->isLinden(from_name);
+ LLMuteList::isLinden(from_name);
if (is_muted && (chat.mSourceType == CHAT_SOURCE_OBJECT))
{
@@ -3820,9 +3820,9 @@ static std::map<LLUUID, PostponedSoundData> postponed_sounds;
void set_attached_sound(LLViewerObject *objectp, const LLUUID &object_id, const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, const U8 flags)
{
- if (LLMuteList::getInstance()->isMuted(object_id)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(object_id)) return;
- if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
// Don't play sounds from a region with maturity above current agent maturity
LLVector3d pos = objectp->getPositionGlobal();
@@ -4122,14 +4122,14 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
if (!LLViewerParcelMgr::getInstanceFast()->canHearSound(pos_global)) return;
// Don't play sounds triggered by someone you muted.
- if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
// Don't play sounds from an object you muted
- if (LLMuteList::getInstance()->isMuted(object_id)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(object_id)) return;
// Don't play sounds from an object whose parent you muted
if (parent_id.notNull()
- && LLMuteList::getInstance()->isMuted(parent_id))
+ && LLMuteList::getInstanceFast()->isMuted(parent_id))
{
return;
}
@@ -4170,8 +4170,8 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
LLViewerObject *objectp = gObjectList.findObject(object_id);
if (!objectp) return;
- if (LLMuteList::getInstance()->isMuted(object_id)) return;
- if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(object_id)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
LLAudioSource *sourcep = objectp->getAudioSource(owner_id);
if (!sourcep) return;
@@ -5102,7 +5102,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
is_name_group = is_source_group;
name_id = source_id;
- if (!reason.empty() && !LLMuteList::getInstance()->isMuted(source_id))
+ if (!reason.empty() && !LLMuteList::getInstanceFast()->isMuted(source_id))
{
message = LLTrans::getString("paid_you_ldollars" + gift_suffix, args);
}
@@ -6043,7 +6043,7 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
void script_question_mute(const LLUUID& task_id, const std::string& object_name)
{
- LLMuteList::getInstance()->add(LLMute(task_id, object_name, LLMute::OBJECT));
+ LLMuteList::getInstanceFast()->add(LLMute(task_id, object_name, LLMute::OBJECT));
// purge the message queue of any previously queued requests from the same source. DEV-4879
class OfferMatcher : public LLNotificationsUI::LLScreenChannel::Matcher
@@ -6126,7 +6126,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
}
// don't display permission requests if this object is muted
- if (LLMuteList::getInstance()->isMuted(taskid)) return;
+ if (LLMuteList::getInstanceFast()->isMuted(taskid)) return;
// throttle excessive requests from any specific user's scripts
typedef LLKeyThrottle<std::string> LLStringThrottle;
@@ -6769,7 +6769,7 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response)
LLAvatarName av_name;
LLAvatarNameCache::get(from_id, &av_name);
- if(LLMuteList::getInstance()->isMuted(from_id) && !LLMuteList::getInstance()->isLinden(av_name.getUserName()))
+ if(LLMuteList::getInstanceFast()->isMuted(from_id) && !LLMuteList::isLinden(av_name.getUserName()))
{
return false;
}
@@ -6924,7 +6924,7 @@ bool callback_script_dialog(const LLSD& notification, const LLSD& response)
std::string object_name = notification["payload"]["object_name"].asString();
LLUUID object_id = notification["payload"]["object_id"].asUUID();
LLMute mute(object_id, object_name, LLMute::OBJECT);
- if (LLMuteList::getInstance()->add(mute))
+ if (LLMuteList::getInstanceFast()->add(mute))
{
// This call opens the sidebar, displays the block list, and highlights the newly blocked
// object in the list so the user can see that their block click has taken effect.
@@ -6981,7 +6981,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
msg->getUUIDFast(_PREHASH_OwnerData, _PREHASH_OwnerID, owner_id);
}
- if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
+ if (LLMuteList::getInstanceFast()->isMuted(object_id) || LLMuteList::getInstanceFast()->isMuted(owner_id))
{
return;
}
@@ -7082,7 +7082,7 @@ void callback_load_url_name(const LLUUID& id, const std::string& full_name, bool
}
// For legacy name-only mutes.
- if (LLMuteList::getInstance()->isMuted(LLUUID::null, owner_name))
+ if (LLMuteList::getInstanceFast()->isMuted(LLUUID::null, owner_name))
{
continue;
}
@@ -7134,8 +7134,8 @@ void process_load_url(LLMessageSystem* msg, void**)
// URL is safety checked in load_url above
// Check if object or owner is muted
- if (LLMuteList::getInstance()->isMuted(object_id, object_name) ||
- LLMuteList::getInstance()->isMuted(owner_id))
+ if (LLMuteList::getInstanceFast()->isMuted(object_id, object_name) ||
+ LLMuteList::getInstanceFast()->isMuted(owner_id))
{
LL_INFOS("Messaging")<<"Ignoring load_url from muted object/owner."<<LL_ENDL;
return;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 50f5ea203e0..27634274d24 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4307,8 +4307,8 @@ void LLVivoxVoiceClient::messageEvent(
if(session)
{
bool is_do_not_disturb = gAgent.isDoNotDisturb();
- bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
- bool is_linden = LLMuteList::getInstance()->isLinden(session->mName);
+ bool is_muted = LLMuteList::getInstanceFast()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
+ bool is_linden = LLMuteList::isLinden(session->mName);
LLChat chat;
chat.mMuted = is_muted && !is_linden;
@@ -4495,7 +4495,7 @@ bool LLVivoxVoiceClient::participantState::updateMuteState()
{
bool result = false;
- bool isMuted = LLMuteList::getInstance()->isMuted(mAvatarID, LLMute::flagVoiceChat);
+ bool isMuted = LLMuteList::getInstanceFast()->isMuted(mAvatarID, LLMute::flagVoiceChat);
if(mOnMuteList != isMuted)
{
mOnMuteList = isMuted;
--
GitLab