diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-14 19:14:16 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-14 19:14:16 +0200 |
| commit | d06742958c3f28cd62e5752aadc107ff98718512 (patch) | |
| tree | e714bf11f3223ce25ee059e96b3f1027ffcd6788 /indra/newview/llparticipantlist.cpp | |
| parent | 6f7b7ef32bb6258ccaf5d5df60a5ede2101ae5de (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/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 47b9f29b48..2c5f1b094e 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -144,6 +144,14 @@ LLParticipantList::~LLParticipantList() mAvatarListRefreshConnection.disconnect(); mAvatarListReturnConnection.disconnect(); + // It is possible Participant List will be re-created from LLCallFloater::onCurrentChannelChanged() + // See ticket EXT-3427 + // hide menu before deleting it to stop enable and check handlers from triggering. + if(mParticipantListMenu) + { + mParticipantListMenu->hide(); + } + delete mParticipantListMenu; mParticipantListMenu = NULL; } |