diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-27 21:21:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-27 21:21:01 -0800 |
| commit | 0b74df6774dd90646e66153b50ea5bb7cdcc39e3 (patch) | |
| tree | 86ee36fbbc828e41bf168dd9bc057a6cfc2c4fd7 | |
| parent | a9caa3151cea77b992c06c5a774d333ffd3016e1 (diff) | |
| parent | 6730aacbfa8e1d6c778f514e489b96b29a247153 (diff) | |
STORM-523 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5a8881a85f..f987cf4852 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -365,6 +365,7 @@ Joghert LeSabre VWR-64 Jonathan Yap VWR-17801 + STORM-523 STORM-616 STORM-679 STORM-596 diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 0eeb89792b..80c78a50c9 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -495,7 +495,7 @@ void LLScreenChannel::modifyToastByNotificationID(LLUUID id, LLPanel* panel) //-------------------------------------------------------------------------- void LLScreenChannel::redrawToasts() { - if(mToastList.size() == 0 || isHovering()) + if(mToastList.size() == 0) return; switch(mToastAlignment) @@ -841,8 +841,7 @@ void LLScreenChannel::onToastHover(LLToast* toast, bool mouse_enter) } } - if(!isHovering()) - redrawToasts(); + redrawToasts(); } //-------------------------------------------------------------------------- |