From 1713a3552b7017cbf781f2effd448f2e8cfb9372 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:52:30 +0000 Subject: merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2 * Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu) --- indra/newview/llscreenchannel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llscreenchannel.cpp') diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 06bdf64b19..8a96a5a1ae 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -66,7 +66,7 @@ LLScreenChannelBase::LLScreenChannelBase(const LLUUID& id) : ,mOverflowToastHidden(false) ,mIsHovering(false) ,mControlHovering(false) - ,mShowToasts(false) + ,mShowToasts(true) { mID = id; mOverflowFormatString = LLTrans::getString("OverflowInfoChannelString"); @@ -142,7 +142,7 @@ void LLScreenChannel::addToast(LLToast::Params p) { bool store_toast = false, show_toast = false; - show_toast = mWasStartUpToastShown && (mShowToasts || p.force_show); + mDisplayToastsAlways ? show_toast = true : show_toast = mWasStartUpToastShown && (mShowToasts || p.force_show); store_toast = !show_toast && p.can_be_stored && mCanStoreToasts; if(!show_toast && !store_toast) -- cgit v1.3