diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-17 12:07:22 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-17 12:07:22 -0800 |
| commit | 3c3c9a0d4918cd5c794504d98f8d81eb47ee8121 (patch) | |
| tree | f9ee0796cafb2f82f66422fa1b2c80f6a46e9602 /indra/viewer_components | |
| parent | 6a6757cab4e96d2567a436fc3b373d96716a685a (diff) | |
| parent | 67a543aa6cc50d8a0b46a1b4e9dd82cdd676cdc1 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/updater/llupdateinstaller.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/viewer_components/updater/llupdateinstaller.cpp b/indra/viewer_components/updater/llupdateinstaller.cpp index 0928cb64e9..d3347d330a 100644 --- a/indra/viewer_components/updater/llupdateinstaller.cpp +++ b/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 {}; |