diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-16 17:39:32 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-16 17:39:32 +0000 |
| commit | 3bb628ff73c0cd06dc374c29db9f56d5f5ab283a (patch) | |
| tree | aec7ced6a886bd19fbc2c39147ff5be95d864d5f /indra/newview/llappviewerwin32.cpp | |
| parent | b6e11798acf6d0539211723e566be7f6145ac138 (diff) | |
| parent | a5d1a7b1bac43a4aa88aa647b040a21ca951c682 (diff) | |
merge from viewer-2-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()) |