Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Black Dragon Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
Logue
Black Dragon Viewer
Commits
e4cac17f
Commit
e4cac17f
authored
3 years ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-16121 Fix viewer not cleaning up obsolete plugin modules on install
parent
97dc9850
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/installers/windows/installer_template.nsi
+22
-1
22 additions, 1 deletion
indra/newview/installers/windows/installer_template.nsi
indra/newview/installers/windows/lang_en-us.nsi
+0
-0
0 additions, 0 deletions
indra/newview/installers/windows/lang_en-us.nsi
with
22 additions
and
1 deletion
indra/newview/installers/windows/installer_template.nsi
+
22
−
1
View file @
e4cac17f
...
@@ -605,6 +605,12 @@ FunctionEnd
...
@@ -605,6 +605,12 @@ FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function RemoveProgFilesOnInst
Function RemoveProgFilesOnInst
# We do not remove whole pervious install folder on install, since
# there is a chance that viewer was installed into some important
# folder by intent or accident
# RMDir /r $INSTDIR is especially unsafe if user installed somewhere
# like Program Files
# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575
# Remove old SecondLife.exe to invalidate any old shortcuts to it that may be in non-standard locations. See MAINT-3575
Delete "$INSTDIR\$INSTEXE"
Delete "$INSTDIR\$INSTEXE"
Delete "$INSTDIR\$VIEWER_EXE"
Delete "$INSTDIR\$VIEWER_EXE"
...
@@ -612,8 +618,23 @@ Delete "$INSTDIR\$VIEWER_EXE"
...
@@ -612,8 +618,23 @@ Delete "$INSTDIR\$VIEWER_EXE"
# Remove old shader files first so fallbacks will work. See DEV-5663
# Remove old shader files first so fallbacks will work. See DEV-5663
RMDir /r "$INSTDIR\app_settings\shaders"
RMDir /r "$INSTDIR\app_settings\shaders"
# Remove skins folder to clean up files removed during development
# Remove folders to clean up files removed during development
RMDir /r "$INSTDIR\app_settings"
RMDir /r "$INSTDIR\skins"
RMDir /r "$INSTDIR\skins"
RMDir /r "$INSTDIR\vmp_icons"
# Remove llplugin, plugins can crash or malfunction if they
# find modules from different versions
RMDir /r "$INSTDIR\llplugin"
IfErrors 0 PREINSTALLCLEAN
StrCmp $SKIP_DIALOGS "true" PREINSTALLCLEAN
MessageBox MB_OKCANCEL $(CloseSecondLifeInstRM) IDOK PREINSTALLCLEAN IDCANCEL PREINSTALLFAIL
PREINSTALLFAIL:
Quit
PREINSTALLCLEAN:
# We are no longer including release notes with the viewer, so remove them.
# We are no longer including release notes with the viewer, so remove them.
Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
...
...
This diff is collapsed.
Click to expand it.
indra/newview/installers/windows/lang_en-us.nsi
+368 B (+3%)
View file @
e4cac17f
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
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