diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-09-02 14:34:06 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-09-02 14:34:06 -0400 |
| commit | a2875ba53ec02235a0db5734264108c0f0898269 (patch) | |
| tree | f9dc66183550cda2c3478f72fa7018094da3cd19 /indra/newview/llinspectremoteobject.cpp | |
| parent | 227eb6c4a49724fe513f5d67af68d355d173f951 (diff) | |
| parent | d07a8b9965b54fca34b239a51af46b996a58d553 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinspectremoteobject.cpp')
| -rw-r--r-- | indra/newview/llinspectremoteobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp index a12ec390af..b64df2bd47 100644 --- a/indra/newview/llinspectremoteobject.cpp +++ b/indra/newview/llinspectremoteobject.cpp @@ -181,7 +181,7 @@ void LLInspectRemoteObject::update() getChild<LLUICtrl>("map_btn")->setEnabled(! mSLurl.empty()); // disable the Block button if we don't have the object ID (will this ever happen?) - getChild<LLUICtrl>("block_btn")->setEnabled(! mObjectID.isNull()); + getChild<LLUICtrl>("block_btn")->setEnabled(!mObjectID.isNull() && !LLMuteList::getInstance()->isMuted(mObjectID)); } ////////////////////////////////////////////////////////////////////////////// |