diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-16 15:27:51 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-16 15:27:51 +0200 |
| commit | 7e6e69a1cc341532ef01d6f437bbe7a2853b9973 (patch) | |
| tree | bb6da385270573764137ab4ccc33007ef4a1d759 /indra/newview/llappviewerwin32.cpp | |
| parent | 13710336cb46a26f00751b1badac2f2dfc14350a (diff) | |
| parent | a872814de964ebcbf40e812f79319a13a54e2336 (diff) | |
merge
--HG--
branch : product-engine
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()) |