diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-16 11:35:24 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-16 11:35:24 +0200 |
| commit | 028e9b998ccad361256af5124c81d12eb2f65710 (patch) | |
| tree | 3b8d9928dd8d7c761b1bb134e4a66159b34602d7 /indra/newview | |
| parent | d6b7a3890369d994704d49ffcea0b4f601a47ab2 (diff) | |
MAINT-3483 FIXED Cursor is not in input field, after double click on resident in Nearby chat
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 4250aeacd6..b18e543f0a 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -296,7 +296,7 @@ BOOL LLConversationViewSession::handleMouseUp( S32 x, S32 y, MASK mask ) LLFloater* volume_floater = LLFloaterReg::findInstance("floater_voice_volume"); LLFloater* chat_volume_floater = LLFloaterReg::findInstance("chat_voice"); if (result - && getRoot() + && getRoot() && (getRoot()->getCurSelectedItem() == this) && !(volume_floater && volume_floater->isShown() && volume_floater->hasFocus()) && !(chat_volume_floater && chat_volume_floater->isShown() && chat_volume_floater->hasFocus())) { |