diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-03-22 15:52:32 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-03-22 15:52:32 +0200 |
| commit | 16bf3611511a38970dadd89482b4ce48ba8c0bbd (patch) | |
| tree | 18746be47125215cbe1d5007a40794d3fe6d0310 /indra/newview/llblocklist.cpp | |
| parent | eddcb4385165316831d19d514ecfe5e9edac4234 (diff) | |
| parent | 7d386378732fb19875e7fb0a3d969d0ba02dc7b3 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llblocklist.cpp')
| -rw-r--r-- | indra/newview/llblocklist.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp index 08d6db4ceb..1589db15a5 100644 --- a/indra/newview/llblocklist.cpp +++ b/indra/newview/llblocklist.cpp @@ -341,6 +341,11 @@ void LLBlockList::onCustomAction(const LLSD& userdata) bool LLBlockList::isMenuItemChecked(const LLSD& userdata) { LLBlockedListItem* item = getBlockedItem(); + if (!item) + { + return false; + } + const std::string command_name = userdata.asString(); if ("block_voice" == command_name) |