From f70545382382182d7a65ff5c1945f9ef9897e196 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 3 Dec 2010 17:12:35 -0800
Subject: Fix for coding standard violations and build error on windows.

---
 indra/viewer_components/updater/llupdatedownloader.cpp | 4 +++-
 indra/viewer_components/updater/llupdaterservice.cpp   | 5 +++--
 indra/viewer_components/updater/llupdaterservice.h     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp
index 7b0f960ce4..ddc14129c2 100644
--- a/indra/viewer_components/updater/llupdatedownloader.cpp
+++ b/indra/viewer_components/updater/llupdatedownloader.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "linden_common.h"
+
+#include "llupdatedownloader.h"
+
 #include <stdexcept>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
@@ -35,7 +38,6 @@
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "llthread.h"
-#include "llupdatedownloader.h"
 #include "llupdaterservice.h"
 
 
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 92a0a09137..dd93fa2550 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -25,10 +25,11 @@
 
 #include "linden_common.h"
 
+#include "llupdaterservice.h"
+
 #include "llupdatedownloader.h"
 #include "llevents.h"
 #include "lltimer.h"
-#include "llupdaterservice.h"
 #include "llupdatechecker.h"
 #include "llupdateinstaller.h"
 #include "llversionviewer.h"
@@ -419,7 +420,7 @@ void LLUpdaterServiceImpl::downloadError(std::string const & message)
 	event["payload"] = payload;
 	LLEventPumps::instance().obtain("mainlooprepeater").post(event);
 
-	setState(LLUpdaterService::ERROR);
+	setState(LLUpdaterService::FAILURE);
 }
 
 void LLUpdaterServiceImpl::restartTimer(unsigned int seconds)
diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h
index 3763fbfde0..8b76a9d1e7 100644
--- a/indra/viewer_components/updater/llupdaterservice.h
+++ b/indra/viewer_components/updater/llupdaterservice.h
@@ -63,7 +63,7 @@ public:
 		INSTALLING,
 		UP_TO_DATE,
 		TERMINAL,
-		ERROR
+		FAILURE
 	};
 
 	LLUpdaterService();
-- 
cgit v1.2.3