diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
| commit | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (patch) | |
| tree | 40918499d2a59dcbbac51f7d24930c174537fe27 /indra/newview/llinspectremoteobject.cpp | |
| parent | 1edf48a0c763dee0f5d274ede6ab82d8d9b30246 (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (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)); } ////////////////////////////////////////////////////////////////////////////// |