diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-17 13:35:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-17 13:35:39 -0400 |
| commit | 6e761bb5f2fac9155b03b74008cfca141968ae6c (patch) | |
| tree | 8fa1dcf8f2f6edae67e832dc34a6286901ae771d /indra/newview/llappviewerwin32.cpp | |
| parent | a5c43859c355afbb5a24d8599756297cad07f590 (diff) | |
| parent | 509457b8ef7bfb8e5b6dcb1a25996ae8fe329007 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 12cff32780..63d9ed19ad 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -480,10 +480,12 @@ bool LLAppViewerWin32::initHardwareTest() gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE); // Disable so debugger can work - std::ostringstream splash_msg; - splash_msg << LLTrans::getString("StartupLoading") << " " << LLAppViewer::instance()->getSecondLifeTitle() << "..."; + std::string splash_msg; + LLStringUtil::format_map_t args; + args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle(); + splash_msg = LLTrans::getString("StartupLoading", args); - LLSplashScreen::update(splash_msg.str()); + LLSplashScreen::update(splash_msg); } if (!restoreErrorTrap()) |