From ba2e9f4495b2423e5a03a2136762a539c532710a Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 20 Nov 2009 12:19:29 +0200 Subject: fixed EXT-2457 "Remove unresolved notifications counter from the Login/Startup toast"; --HG-- branch : product-engine --- indra/newview/llscreenchannel.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'indra/newview/llscreenchannel.cpp') diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index d1cf4a0810..c4d3fb9d7d 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -535,17 +535,7 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer) std::string mStartUpFormatString; - if(notif_num == 1) - { - mStartUpFormatString = LLTrans::getString("StartUpNotification"); - } - else - { - mStartUpFormatString = LLTrans::getString("StartUpNotifications"); - } - - - std::string text = llformat(mStartUpFormatString.c_str(), notif_num); + std::string text = LLTrans::getString("StartUpNotifications"); toast_rect = mStartUpToastPanel->getRect(); mStartUpToastPanel->reshape(getRect().getWidth(), toast_rect.getHeight(), true); -- cgit v1.2.3 From a995c494d4a3c7750532f01d2c8c693e7ff32ea3 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 20 Nov 2009 12:52:40 +0200 Subject: removed redundant local variable --HG-- branch : product-engine --- indra/newview/llscreenchannel.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llscreenchannel.cpp') diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index c4d3fb9d7d..24505f6bd6 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -533,8 +533,6 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer) LLTextBox* text_box = mStartUpToastPanel->getChild("toast_text"); - std::string mStartUpFormatString; - std::string text = LLTrans::getString("StartUpNotifications"); toast_rect = mStartUpToastPanel->getRect(); -- cgit v1.2.3