From 669d1162f4c7529296d7018ec65960f120cc1c3e Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 17 Apr 2008 14:56:00 +0000
Subject: QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
---
 .../installers/windows/installer_template.nsi       | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'indra/newview/installers')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 8db336f86f..836780d140 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -87,7 +87,6 @@ SetShellVarContext all			; install for all users (if you change this, change it
 
 ; Start with some default values.
 StrCpy $INSTFLAGS "${INSTFLAGS}"
-StrCpy $INSTFLAGS "$INSTFLAGS $LANGFLAGS"
 StrCpy $INSTPROG "${INSTNAME}"
 StrCpy $INSTEXE "${INSTEXE}"
 StrCpy $INSTSHORTCUT "${SHORTCUT}"
@@ -933,26 +932,6 @@ Function .onInit
 
 	; save language in registry		
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
-	
-	; generate language ID that will be used as a command line arg	
-	StrCmp $LANGUAGE "1042" 0 +3
-	StrCpy $LANGFLAGS " --set SystemLanguage ko"
-	Goto EndOfFunc
-
-	StrCmp $LANGUAGE "1041" 0 +3
-	StrCpy $LANGFLAGS " --set SystemLanguage ja"
-	Goto EndOfFunc
-
-	StrCmp $LANGUAGE "1031" 0 +3
-	StrCpy $LANGFLAGS " --set SystemLanguage de"
-	Goto EndOfFunc
-
-	StrCmp $LANGUAGE "1033" 0 +3
-	StrCpy $LANGFLAGS " --set SystemLanguage en-us"
-	Goto EndOfFunc
-	
-	EndOfFunc:
-
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.3