diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-12 18:58:29 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-12 18:58:29 +0200 |
| commit | e7af49ce5d8313efa3d58cd90c2a67abd43fc822 (patch) | |
| tree | a255ad12c868898c7fac3947175a01b19299b354 /indra/newview/llnearbychathandler.cpp | |
| parent | 381c9f468d9ff0d48b0e80430856251acfe17066 (diff) | |
| parent | 4c637196e4c511c7d199a66759671e16e9a7566b (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index e10c506f08..b4e0ab198a 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -223,7 +223,7 @@ void LLNearbyChatScreenChannel::addNotification(LLSD& notification) void LLNearbyChatScreenChannel::arrangeToasts() { - if(m_active_toasts.size() == 0 || mIsHovering) + if(m_active_toasts.size() == 0 || isHovering()) return; hideToastsFromScreen(); |