summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-12-27 12:04:51 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-12-27 12:04:51 +0200
commit92d84a9c365756eeaf7234af42e53f09866263a0 (patch)
tree9e07d973cb8b927a614d73952afb75f8cd25aad7 /indra
parent596018361c2f3980eab7dd4275c2bdeb6c8505e3 (diff)
MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem()
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 7039e48e74..7007c58b3c 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1505,15 +1505,21 @@ bool LLFloaterIMContainer::checkContextMenuItem(const std::string& item, uuid_ve
bool LLFloaterIMContainer::visibleContextMenuItem(const LLSD& userdata)
{
+ const LLConversationItem *conversation_item = getCurSelectedViewModelItem();
+ if(!conversation_item)
+ {
+ return false;
+ }
+
const std::string& item = userdata.asString();
if ("show_mute" == item)
{
- return !isMuted(getCurSelectedViewModelItem()->getUUID());
+ return !isMuted(conversation_item->getUUID());
}
else if ("show_unmute" == item)
{
- return isMuted(getCurSelectedViewModelItem()->getUUID());
+ return isMuted(conversation_item->getUUID());
}
return true;