summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-11-01 22:08:44 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-11-01 22:08:44 -0400
commita186f9a729e9ae9c834121708177b177f2c26283 (patch)
tree60113a86b7b28b2ba53f3b94e0fb99b5de5ca4dd /indra/newview/viewer_manifest.py
parente2ca890898ecb79ff314b1f748bb6a3a9dbf602b (diff)
DRTVWR-447: Allow Standard Windows user to install for current user.
This should eliminate any confusion due to a Standard user needing to elevate to Admin privileges, since from that point on Windows tells the running program the current user is that Admin. Bypass all that.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3556b82320..1e58cec808 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -806,10 +806,10 @@ class WindowsManifest(ViewerManifest):
if(self.address_size == 64):
engage_registry="SetRegView 64"
- program_files="$PROGRAMFILES64"
+ program_files="!define MULTIUSER_USE_PROGRAMFILES64"
else:
engage_registry="SetRegView 32"
- program_files="$PROGRAMFILES32"
+ program_files=""
tempfile = "secondlife_setup_tmp.nsi"
# the following replaces strings in the nsi template