Automated merge with https://bitbucket.org/mani_linden/viewer-development

indra/viewer_components/updater/llupdateinstaller.cpp

@@ -23,10 +23,6 @@
  * $/LicenseInfo$
  */
 
-#if defined(LL_WINDOWS)
-#pragma warning(disable: 4702)      // disable 'unreachable code' so we can use lexical_cast (really!).
-#endif
-
 #include "linden_common.h"
 #include <apr_file_io.h>
 #include <boost/lexical_cast.hpp>
@@ -36,6 +32,11 @@
 #include "lldir.h"
 
 
+#if defined(LL_WINDOWS)
+#pragma warning(disable: 4702)      // disable 'unreachable code' so we can use lexical_cast (really!).
+#endif
+
+
 namespace {
 	class RelocateError {};