diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-20 12:19:29 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-20 12:19:29 +0200 |
| commit | ba2e9f4495b2423e5a03a2136762a539c532710a (patch) | |
| tree | b4d043663a1a722afe0119917746a17497e0273c | |
| parent | f3c53a84d3e4605546fbe038ad8a2b863d2cc399 (diff) | |
fixed EXT-2457 "Remove unresolved notifications counter from the Login/Startup toast";
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
2 files changed, 2 insertions, 13 deletions
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); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e76763d7eb..b3728cb425 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1782,8 +1782,7 @@ Clears (deletes) the media and all params from the given face. <string name="GroupNotifySaveAttachment">Save Attachment</string> <string name="TeleportOffer">Teleport offering</string> <!-- start-up toast's string--> - <string name="StartUpNotification">%d new notification arrived while you were away...</string> - <string name="StartUpNotifications">%d new notifications arrived while you were away...</string> + <string name="StartUpNotifications">New notifications arrived while you were away.</string> <!-- overflow toast's string--> <string name="OverflowInfoChannelString">You have %d more notification</string> |