diff options
| author | PavelK ProductEngine <pkrivich@productengine.com> | 2013-07-10 19:44:29 +0300 |
|---|---|---|
| committer | PavelK ProductEngine <pkrivich@productengine.com> | 2013-07-10 19:44:29 +0300 |
| commit | ae01baa0567a5e0c3f9c63936bd939cd7dc4f45d (patch) | |
| tree | e2c5275e036a8453d6e5601411a127ecd308705f | |
| parent | 13361137d0d2ccb750d6002826763579d3d1cc69 (diff) | |
CHUI-984 FIX Clicking on voice icon no longer brings up voice volume slider
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 54baaeee53..9faa12b2ee 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -277,8 +277,13 @@ BOOL LLConversationViewSession::handleMouseUp( S32 x, S32 y, MASK mask ) { BOOL result = LLFolderViewFolder::handleMouseUp(x, y, mask); - if(result && getRoot()) - { + LLFloater* volume_floater = LLFloaterReg::findInstance("floater_voice_volume"); + LLFloater* chat_volume_floater = LLFloaterReg::findInstance("chat_voice"); + if (result + && getRoot() + && !(volume_floater && volume_floater->isShown() && volume_floater->hasFocus()) + && !(chat_volume_floater && chat_volume_floater->isShown() && chat_volume_floater->hasFocus())) + { LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem()); LLUUID session_id = item? item->getUUID() : LLUUID(); LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id); |