summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-11-12 01:45:21 +0200
committerAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-11-12 01:45:21 +0200
commit74bf67418dc7440afd1305ef8e0d157d3b5cb0f2 (patch)
tree2b5a41d06aaa86634f534d6c96939a5045656426 /indra
parent049c795b1276202a844ea54c9129515238127b3c (diff)
MAINT-5847 FIXED Crash on attempt to IM related to global toggle of people icons
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llconversationview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 3a6e4c4dfe..e4cf8d3fbb 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -437,7 +437,7 @@ void LLConversationViewSession::setIconsVisible(bool visible)
// Show/hide icons for the 1-n-1 chat.
LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
- if (vmi)
+ if (vmi && mItemPanel)
{
switch (vmi->getType())
{