diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
| commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
| tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/newview/llconversationview.cpp | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge changes for 3.7.27-release
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -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())) { |