diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-12 16:47:15 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-12 16:47:15 -0800 |
commit | 92cacc5581dc52058a65e305d8530f9da1445480 (patch) | |
tree | d06658448ef5aba5e9dfaca9be724d9e732ae022 /indra/newview/llnearbychathandler.cpp | |
parent | fd9257a5f2649d7afbf65067c0fa4653fc81272c (diff) | |
parent | 74d5a6605bac7ae76889ce3697fc8f59d982d675 (diff) |
Merge with 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(); |