diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
| commit | 33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch) | |
| tree | d30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/llscreenchannel.h | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
| parent | 89434ef6e64462041368ab26e049011fc84ae1e3 (diff) | |
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/llscreenchannel.h')
| -rw-r--r-- | indra/newview/llscreenchannel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index f05c205e2a..a205b913ab 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -73,6 +73,7 @@ public: void setHovering(bool hovering) { mIsHovering = hovering; } void removeToastsFromChannel(); + void closeUnreadToastsPanel(); void hideToastsFromScreen(); void setStoreToasts(bool store) { mStoreToasts = store; } @@ -125,7 +126,7 @@ private: void showToastsCentre(); void showToastsTop(); - void createOverflowToast(S32 bottom, F32 timer = 0); + void createOverflowToast(S32 bottom, F32 timer); void onOverflowToastHide(); static bool mWasStartUpToastShown; |