merge changes for 3.6.13-release

2 files changed, 26 insertions, 7 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index dd316cdbdf..c4f503ef4e 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -301,6 +301,23 @@ Function CheckNetworkConnection
     Return

 FunctionEnd

 

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Function CheckOldExeName

+; Viewer versions < 3.6.12 used the name 'SecondLife.exe'

+; If that name is found in the install folder, delete it to invalidate any

+; old shortcuts to it that may be in non-standard locations, so that the user

+; does not end up running the old version (potentially getting caught in an 

+; infinite update loop). See MAINT-3575

+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+Function CheckOldExeName

+  IfFileExists "$INSTDIR\SecondLife.exe" CHECKOLDEXE_FOUND CHECKOLDEXE_DONE

+

+CHECKOLDEXE_FOUND:

+  Delete "$INSTDIR\SecondLife.exe"

+CHECKOLDEXE_DONE:

+FunctionEnd

+

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ; Function CheckWillUninstallV2               

@@ -673,6 +690,9 @@ Delete "$INSTDIR\*.glsl"
 Delete "$INSTDIR\motions\*.lla"

 Delete "$INSTDIR\trial\*.html"

 Delete "$INSTDIR\newview.exe"

+Delete "$INSTDIR\SecondLife.exe"

+;; MAINT-3099 workaround - prevent these log files, if present, from causing a user alert

+Delete "$INSTDIR\VivoxVoiceService-*.log"

 ;; Remove entire help directory

 Delete "$INSTDIR\help\Advanced\*"

 RMDir  "$INSTDIR\help\Advanced"

@@ -920,6 +940,7 @@ Call CheckIfAlreadyCurrent		; Make sure that we haven't already installed this v
 Call CloseSecondLife			; Make sure we're not running

 Call CheckNetworkConnection		; ping secondlife.com

 Call CheckWillUninstallV2               ; See if a V2 install exists and will be removed.

+Call CheckOldExeName                    ; Clean up a previous version of the exe

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9e8623c1f9..9a617c2a13 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -136,13 +136,11 @@ class ViewerManifest(LLManifest):
                     settings_install['CmdLineGridChoice']['Value'] = self.grid()
                     print "Set CmdLineGridChoice in settings_install.xml to '%s'" % self.grid()
 
-                # did we actually copy anything into settings_install dict?
-                if settings_install:
-                    # put_in_file(src=) need not be an actual pathname; it
-                    # only needs to be non-empty
-                    self.put_in_file(llsd.format_pretty_xml(settings_install),
-                                     "settings_install.xml",
-                                     src="environment")
+                # put_in_file(src=) need not be an actual pathname; it
+                # only needs to be non-empty
+                self.put_in_file(llsd.format_pretty_xml(settings_install),
+                                 "settings_install.xml",
+                                 src="environment")
 
                 self.end_prefix("app_settings")