diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 22:56:07 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 22:56:07 -0400 |
| commit | 35cec8fec8fef36a75bbb168e38c235ff0c47b49 (patch) | |
| tree | 426827bbfb3680f8392a488861ae901a03759aff /indra/newview/llappviewer.cpp | |
| parent | 09e953a3b7ead5ff5797be80d470b657c61234ea (diff) | |
| parent | b78065ec5519b2eced35061e3e0e83e3100ea054 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d41f33700f..850f7b1c31 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3111,7 +3111,12 @@ void LLAppViewer::initUpdater() mUpdater->setAppExitCallback(boost::bind(&LLAppViewer::forceQuit, this)); mUpdater->initialize(channel, version, +// DRTVWR-418 transitional: query using "win64" until VMP is in place +#if LL_WINDOWS && (ADDRESS_SIZE == 64) + "win64", +#else gPlatform, +#endif getOSInfo().getOSVersionString(), unique_id, willing_to_test |