Merge whitespace-only changes

2 files changed, 44 insertions, 44 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0d4b7d027c..d3c5cfc390 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4251,47 +4251,47 @@ void LLAppViewer::launchUpdater()
 	// Run the auto-updater.
 	system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
 
-#elif (LL_LINUX || LL_SOLARIS) && LL_GTK

-	// we tell the updater where to find the xml containing string

-	// translations which it can use for its own UI

-	std::string xml_strings_file = "strings.xml";

-	std::vector<std::string> xui_path_vec = LLUI::getXUIPaths();

-	std::string xml_search_paths;

-	std::vector<std::string>::const_iterator iter;

-	// build comma-delimited list of xml paths to pass to updater

-	for (iter = xui_path_vec.begin(); iter != xui_path_vec.end(); )

-	{

-		std::string this_skin_dir = gDirUtilp->getDefaultSkinDir()

-			+ gDirUtilp->getDirDelimiter()

-			+ (*iter);

-		llinfos << "Got a XUI path: " << this_skin_dir << llendl;

-		xml_search_paths.append(this_skin_dir);

-		++iter;

-		if (iter != xui_path_vec.end())

-			xml_search_paths.append(","); // comma-delimit

-	}

-	// build the overall command-line to run the updater correctly

-	update_exe_path = 

-		gDirUtilp->getExecutableDir() + "/" + "linux-updater.bin" + 

-		" --url \"" + update_url.asString() + "\"" +

-		" --name \"" + LLAppViewer::instance()->getSecondLifeTitle() + "\"" +

-		" --dest \"" + gDirUtilp->getAppRODataDir() + "\"" +

-		" --stringsdir \"" + xml_search_paths + "\"" +

-		" --stringsfile \"" + xml_strings_file + "\"";

-

-	LL_INFOS("AppInit") << "Calling updater: " 

-			    << update_exe_path << LL_ENDL;

-

-	// *TODO: we could use the gdk equivilant 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))

-	{

-		llerrs << "Failed to launch updater: "

-		       << error->message

-		       << llendl;

-	}

-	if (error) {

+#elif (LL_LINUX || LL_SOLARIS) && LL_GTK
+	// we tell the updater where to find the xml containing string
+	// translations which it can use for its own UI
+	std::string xml_strings_file = "strings.xml";
+	std::vector<std::string> xui_path_vec = LLUI::getXUIPaths();
+	std::string xml_search_paths;
+	std::vector<std::string>::const_iterator iter;
+	// build comma-delimited list of xml paths to pass to updater
+	for (iter = xui_path_vec.begin(); iter != xui_path_vec.end(); )
+	{
+		std::string this_skin_dir = gDirUtilp->getDefaultSkinDir()
+			+ gDirUtilp->getDirDelimiter()
+			+ (*iter);
+		llinfos << "Got a XUI path: " << this_skin_dir << llendl;
+		xml_search_paths.append(this_skin_dir);
+		++iter;
+		if (iter != xui_path_vec.end())
+			xml_search_paths.append(","); // comma-delimit
+	}
+	// build the overall command-line to run the updater correctly
+	update_exe_path = 
+		gDirUtilp->getExecutableDir() + "/" + "linux-updater.bin" + 
+		" --url \"" + update_url.asString() + "\"" +
+		" --name \"" + LLAppViewer::instance()->getSecondLifeTitle() + "\"" +
+		" --dest \"" + gDirUtilp->getAppRODataDir() + "\"" +
+		" --stringsdir \"" + xml_search_paths + "\"" +
+		" --stringsfile \"" + xml_strings_file + "\"";
+
+	LL_INFOS("AppInit") << "Calling updater: " 
+			    << update_exe_path << LL_ENDL;
+
+	// *TODO: we could use the gdk equivilant 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))
+	{
+		llerrs << "Failed to launch updater: "
+		       << error->message
+		       << llendl;
+	}
+	if (error) {
 		g_error_free(error);
 	}
 #else
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 2f4d00786c..e56d28e066 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -346,9 +346,9 @@ void LLLoginInstance::updateApp(bool mandatory, const std::string& auth_msg)
 	
 #if LL_WINDOWS
 	notification_name += "Windows";
-#elif LL_DARWIN

-	notification_name += "Mac";

-#else

+#elif LL_DARWIN
+	notification_name += "Mac";
+#else
 	notification_name += "Linux";
 #endif