merge changes for 3.6.12-release

1 files changed, 8 insertions, 20 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 4815c1a538..ffc6847bc2 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -72,16 +72,8 @@ LangString LanguageCode ${LANG_RUSSIAN}  "ru"
 LangString LanguageCode ${LANG_TURKISH}  "tr"

 LangString LanguageCode ${LANG_TRADCHINESE}  "zh"

 

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

-;; For example:

-;; !define INSTFLAGS "%(flags)s"

-;; !define INSTNAME   "SecondLife%(grid_caps)s"

-;; !define SHORTCUT   "Second Life (%(grid_caps)s)"

-;; !define URLNAME   "secondlife%(grid)s"

-;; !define UNINSTALL_SETTINGS 1

-

-%%GRID_VARS%%

+;; this placeholder is replaced by viewer_manifest.py

+%%INST_VARS%%

 

 Name ${INSTNAME}

 

@@ -109,7 +101,6 @@ Page instfiles
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Var INSTPROG

 Var INSTEXE

-Var INSTFLAGS

 Var INSTSHORTCUT

 Var COMMANDLINE         ; command line passed to this installer, set in .onInit

 Var SHORTCUT_LANG_PARAM ; "--set InstallLanguage de", passes language to viewer

@@ -149,7 +140,7 @@ label_ask_launch:
         

 label_launch:

 	# Assumes SetOutPath $INSTDIR

-	Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS $SHORTCUT_LANG_PARAM'

+	Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'

 label_no_launch:

 	Pop $R0

 FunctionEnd

@@ -730,7 +721,6 @@ ShowUninstDetails show
 Section Uninstall

 

 ; Start with some default values.

-StrCpy $INSTFLAGS ""

 StrCpy $INSTPROG "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

@@ -839,7 +829,6 @@ Section ""						; (default section)
 SetShellVarContext all			; install for all users (if you change this, change it in the uninstall as well)

 

 ; Start with some default values.

-StrCpy $INSTFLAGS "${INSTFLAGS}"

 StrCpy $INSTPROG "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

@@ -885,7 +874,7 @@ StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
 CreateDirectory	"$SMPROGRAMS\$INSTSHORTCUT"

 SetOutPath "$INSTDIR"

 CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

-				"$INSTDIR\$INSTEXE" "$INSTFLAGS $SHORTCUT_LANG_PARAM"

+				"$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

 

 

 WriteINIStr		"$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \

@@ -904,9 +893,9 @@ CreateShortCut	"$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
 ; Other shortcuts

 SetOutPath "$INSTDIR"

 CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \

-        "$INSTDIR\$INSTEXE" "$INSTFLAGS $SHORTCUT_LANG_PARAM"

+        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

 CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \

-        "$INSTDIR\$INSTEXE" "$INSTFLAGS $SHORTCUT_LANG_PARAM"

+        "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"

 CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

 				'"$INSTDIR\uninst.exe"' ''

 

@@ -915,7 +904,6 @@ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
 ; Write registry

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

@@ -928,13 +916,13 @@ WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
 WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

 ;; URL param must be last item passed to viewer, it ignores subsequent params

 ;; to avoid parameter injection attacks.

-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info"(default)" "URL:Second Life"

 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""

 WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

 ;; URL param must be last item passed to viewer, it ignores subsequent params

 ;; to avoid parameter injection attacks.

-WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

+WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'

 

 ; write out uninstaller

 WriteUninstaller "$INSTDIR\uninst.exe"