Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
3e17a3c8
Commit
3e17a3c8
authored
6 years ago
by
Nat Goodspeed
Browse files
Options
Downloads
Patches
Plain Diff
SL-10506: Try again to attain desired behavior.
parent
1ff58087
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/installers/windows/installer_template.nsi
+12
-1
12 additions, 1 deletion
indra/newview/installers/windows/installer_template.nsi
with
12 additions
and
1 deletion
indra/newview/installers/windows/installer_template.nsi
+
12
−
1
View file @
3e17a3c8
...
@@ -184,9 +184,20 @@ Function .onInit
...
@@ -184,9 +184,20 @@ Function .onInit
%%ENGAGEREGISTRY%%
%%ENGAGEREGISTRY%%
# Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
#
SL-10506:
Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and
# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should
# read the current location of the install for this version into INSTDIR.
# read the current location of the install for this version into INSTDIR.
# However, SL-10506 complains about the resulting behavior, so the logic below
# is adapted from before we introduced MultiUser.nsh.
# if $0 is empty, this is the first time for this viewer name
ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" ""
# viewer with this name was installed before
${If} $0 != ""
# use the value we got from registry as install location
StrCpy $INSTDIR $0
${EndIf}
Call CheckCPUFlags # Make sure we have SSE2 support
Call CheckCPUFlags # Make sure we have SSE2 support
Call CheckWindowsVersion # Don't install On unsupported systems
Call CheckWindowsVersion # Don't install On unsupported systems
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment