diff options
| author | Jonathan Yap <none@none> | 2010-12-03 03:37:37 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2010-12-03 03:37:37 -0500 |
| commit | 106134b6950b55a8462fc3444db781104eb6bf5e (patch) | |
| tree | 0d5c17edf94435c204ff94f62a525953b48e00d3 | |
| parent | 6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff) | |
Fix for OK notification being overlaid by Keep/Discard/Block notification
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d4e459039d..f25656da9a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -356,6 +356,7 @@ Joghert LeSabre Jonathan Yap VWR-17801 STORM-616 + STORM-523 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 61f4897ed0..92a06b763f 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -485,7 +485,7 @@ void LLScreenChannel::modifyToastByNotificationID(LLUUID id, LLPanel* panel) //-------------------------------------------------------------------------- void LLScreenChannel::redrawToasts() { - if(mToastList.size() == 0 || isHovering()) + if(mToastList.size() == 0) return; switch(mToastAlignment) |