diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 22:55:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 22:55:18 -0400 |
| commit | b78065ec5519b2eced35061e3e0e83e3100ea054 (patch) | |
| tree | 8191b7e3d2005ce72fba526fb1c1a2be3ec67eb1 | |
| parent | d6b870c0cae04a9a2576c8849ebe03822eb78e6c (diff) | |
DRTVWR-418: 64-bit Windows viewer requests "win64" updates from VVM.
This is only transitional, until we integrate the Viewer Management Process
(soon now).
| -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 ae4e3df70f..6ce5f6943e 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 |