livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-602 FIXED Return false if Selected view model item is null.

meow-7.2.2
maxim@mnikolenko 2013-01-08 14:38:30 +02:00
parent e594585905
commit dbe1d2f093
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloaterimcontainer.cpp
View File

@ -1124,16 +1124,23 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
//Enable Chat history item for ad-hoc and group conversations
if ("can_chat_history" == item)
{
if (getCurSelectedViewModelItem()->getType() != LLConversationItem::CONV_PARTICIPANT)
if(getCurSelectedViewModelItem())
{
return isConversationLoggingAllowed();
if (getCurSelectedViewModelItem()->getType() != LLConversationItem::CONV_PARTICIPANT)
{
return isConversationLoggingAllowed();
}
}
}
// If nothing is selected(and selected item is not group chat), everything needs to be disabled
if (uuids.size() <= 0)
{
return getCurSelectedViewModelItem()->getType() == LLConversationItem::CONV_SESSION_GROUP;
if(getCurSelectedViewModelItem())
{
return getCurSelectedViewModelItem()->getType() == LLConversationItem::CONV_SESSION_GROUP;
}
return false;
}
if("can_activate_group" == item)