diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-08 16:21:03 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-08 16:21:03 -0700 |
| commit | 5669597e1803f24ee2ea452a792ecf35deffaee8 (patch) | |
| tree | e783640e25f7fef4875c5433cdd8cdae50ec4168 | |
| parent | 285a4173aacedd30e8f662c24074a937f6f038fe (diff) | |
QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() with Windows and Mac
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d3c5cfc390..93c203cecd 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4271,7 +4271,7 @@ void LLAppViewer::launchUpdater() xml_search_paths.append(","); // comma-delimit } // build the overall command-line to run the updater correctly - update_exe_path = + LLAppViewer::sUpdaterInfo->mUpdateExePath = gDirUtilp->getExecutableDir() + "/" + "linux-updater.bin" + " --url \"" + update_url.asString() + "\"" + " --name \"" + LLAppViewer::instance()->getSecondLifeTitle() + "\"" + @@ -4280,12 +4280,12 @@ void LLAppViewer::launchUpdater() " --stringsfile \"" + xml_strings_file + "\""; LL_INFOS("AppInit") << "Calling updater: " - << update_exe_path << LL_ENDL; + << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL; - // *TODO: we could use the gdk equivilant to ensure the updater + // *TODO: we could use the gdk equivalent to ensure the updater // gets started on the same screen. GError *error = NULL; - if (!g_spawn_command_line_async(update_exe_path.c_str(), &error)) + if (!g_spawn_command_line_async(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), &error)) { llerrs << "Failed to launch updater: " << error->message |