move setting default grid to settings_install.xml so that it works on all platforms

1 files changed, 2 insertions, 10 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 8a6114f0d5..4742d7e178 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}