summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-14 19:14:16 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-12-14 19:14:16 +0200
commitd06742958c3f28cd62e5752aadc107ff98718512 (patch)
treee714bf11f3223ce25ee059e96b3f1027ffcd6788 /indra/newview/llcallfloater.cpp
parent6f7b7ef32bb6258ccaf5d5df60a5ede2101ae5de (diff)
Update for critical bug EXT-3427 - Viewer chashes if select Moderator Options submenu in Voice controls quickly.
Added code to hide menu before destroying it. Added aditional checks. Added comments --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r--indra/newview/llcallfloater.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 4f1164788d..2f5523e04d 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -280,7 +280,11 @@ void LLCallFloater::refreshPartisipantList()
void LLCallFloater::onCurrentChannelChanged(const LLUUID& /*session_id*/)
{
- if(LLVoiceChannel::STATE_NO_CHANNEL_INFO == LLVoiceChannel::getCurrentVoiceChannel()->getState())
+ // Don't update participant list if no channel info is available.
+ // Fix for ticket EXT-3427
+ // @see LLParticipantList::~LLParticipantList()
+ if(LLVoiceChannel::getCurrentVoiceChannel() &&
+ LLVoiceChannel::STATE_NO_CHANNEL_INFO == LLVoiceChannel::getCurrentVoiceChannel()->getState())
{
return;
}