From 5669597e1803f24ee2ea452a792ecf35deffaee8 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 8 Sep 2009 16:21:03 -0700 Subject: QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() with Windows and Mac --- indra/newview/llappviewer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview') 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 -- cgit v1.2.3