summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-20 14:43:58 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-20 14:43:58 -0800
commit0bdf520f4f399e1a368893db066d829b0ae3890e (patch)
treefeb30880a5573ac39b2f7b360fce3835dec50569 /indra/newview/llscreenchannel.cpp
parent3bb86f91bc345f74057debe1f8f680098895a40e (diff)
parentc9101f603a7969f4d46a7d8d911fa8805d926548 (diff)
Merge from product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
-rw-r--r--indra/newview/llscreenchannel.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index d1cf4a0810..24505f6bd6 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -533,19 +533,7 @@ void LLScreenChannel::createStartUpToast(S32 notif_num, F32 timer)
LLTextBox* text_box = mStartUpToastPanel->getChild<LLTextBox>("toast_text");
- 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);