aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/installers
diff options
context:
space:
mode:
authorDavid Seikel2011-02-09 01:57:04 +1000
committerDavid Seikel2011-02-09 01:57:04 +1000
commit6a87cef1d449e8cdf8ebac53994a9a032792cf92 (patch)
treec6f129866713b590e2a02e2199f5b6fd8595438e /linden/indra/newview/installers
parentMerge branch 'branding' of github.com:onefang/meta-impy into branding (diff)
downloadmeta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.zip
meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.gz
meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.bz2
meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.xz
Change imprudence -> meta-impy, though not the URLs. Probably some will need to be reverted later.
Changed file names to.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/installers/windows/installer_template.nsi52
-rw-r--r--linden/indra/newview/installers/windows/lang_de.nsi30
-rw-r--r--linden/indra/newview/installers/windows/lang_en-us.nsi26
-rw-r--r--linden/indra/newview/installers/windows/meta-impy installer script experimental.iss (renamed from linden/indra/newview/installers/windows/imprudence installer script experimental.iss)56
-rw-r--r--linden/indra/newview/installers/windows/meta-impy installer script.iss (renamed from linden/indra/newview/installers/windows/imprudence installer script.iss)56
-rw-r--r--linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp (renamed from linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp)bin154542 -> 154542 bytes
-rw-r--r--linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp (renamed from linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp)bin8534 -> 8534 bytes
7 files changed, 110 insertions, 110 deletions
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 8afde89..ee79954 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -287,7 +287,7 @@ FunctionEnd
287;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 287;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
288Function CloseSecondLife 288Function CloseSecondLife
289 Push $0 289 Push $0
290 FindWindow $0 "Imprudence" "" 290 FindWindow $0 "meta-impy" ""
291 IntCmp $0 0 DONE 291 IntCmp $0 0 DONE
292 MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL 292 MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
293 293
@@ -299,7 +299,7 @@ Function CloseSecondLife
299 SendMessage $0 16 0 0 299 SendMessage $0 16 0 0
300 300
301 LOOP: 301 LOOP:
302 FindWindow $0 "Imprudence" "" 302 FindWindow $0 "meta-impy" ""
303 IntCmp $0 0 DONE 303 IntCmp $0 0 DONE
304 Sleep 500 304 Sleep 500
305 Goto LOOP 305 Goto LOOP
@@ -344,12 +344,12 @@ FunctionEnd
344; FunctionEnd 344; FunctionEnd
345 345
346;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 346;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
347; Delete files in Documents and Settings\<user>\Imprudence\cache 347; Delete files in Documents and Settings\<user>\meta-impy\cache
348; Delete files in Documents and Settings\All Users\Imprudence\cache 348; Delete files in Documents and Settings\All Users\meta-impy\cache
349;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 349;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
350;Function RemoveCacheFiles 350;Function RemoveCacheFiles
351; 351;
352;; Delete files in Documents and Settings\<user>\Imprudence 352;; Delete files in Documents and Settings\<user>\meta-impy
353;Push $0 353;Push $0
354;Push $1 354;Push $1
355;Push $2 355;Push $2
@@ -368,7 +368,7 @@ FunctionEnd
368; ExpandEnvStrings $2 $2 368; ExpandEnvStrings $2 $2
369; 369;
370; ; When explicitly uninstalling, everything goes away 370; ; When explicitly uninstalling, everything goes away
371; RMDir /r "$2\Application Data\Imprudence\cache" 371; RMDir /r "$2\Application Data\meta-impy\cache"
372; 372;
373; CONTINUE: 373; CONTINUE:
374; IntOp $0 $0 + 1 374; IntOp $0 $0 + 1
@@ -378,17 +378,17 @@ FunctionEnd
378;Pop $1 378;Pop $1
379;Pop $0 379;Pop $0
380; 380;
381;; Delete files in Documents and Settings\All Users\Imprudence 381;; Delete files in Documents and Settings\All Users\meta-impy
382;Push $0 382;Push $0
383; ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" 383; ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
384; StrCmp $0 "" +2 384; StrCmp $0 "" +2
385; RMDir /r "$0\Imprudence\cache" 385; RMDir /r "$0\meta-impy\cache"
386;Pop $0 386;Pop $0
387; 387;
388;; Delete filse in C:\Windows\Application Data\Imprudence 388;; Delete filse in C:\Windows\Application Data\meta-impy
389;; If the user is running on a pre-NT system, Application Data lives here instead of 389;; If the user is running on a pre-NT system, Application Data lives here instead of
390;; in Documents and Settings. 390;; in Documents and Settings.
391;RMDir /r "$WINDIR\Application Data\Imprudence\cache" 391;RMDir /r "$WINDIR\Application Data\meta-impy\cache"
392; 392;
393;FunctionEnd 393;FunctionEnd
394 394
@@ -438,12 +438,12 @@ FunctionEnd
438 438
439 439
440;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 440;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
441; Delete files in Documents and Settings\<user>\Imprudence 441; Delete files in Documents and Settings\<user>\meta-impy
442; Delete files in Documents and Settings\All Users\Imprudence 442; Delete files in Documents and Settings\All Users\meta-impy
443;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 443;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
444Function un.DocumentsAndSettingsFolder 444Function un.DocumentsAndSettingsFolder
445 445
446; Delete files in Documents and Settings\<user>\Imprudence 446; Delete files in Documents and Settings\<user>\meta-impy
447Push $0 447Push $0
448Push $1 448Push $1
449Push $2 449Push $2
@@ -466,13 +466,13 @@ Push $2
466 ; Otherwise (preview/dmz etc) just remove cache 466 ; Otherwise (preview/dmz etc) just remove cache
467 StrCmp $INSTFLAGS "" RM_ALL RM_CACHE 467 StrCmp $INSTFLAGS "" RM_ALL RM_CACHE
468 RM_ALL: 468 RM_ALL:
469 RMDir /r "$2\Application Data\Imprudence" 469 RMDir /r "$2\Application Data\meta-impy"
470 RM_CACHE: 470 RM_CACHE:
471 # Local Settings directory is the cache, there is no "cache" subdir 471 # Local Settings directory is the cache, there is no "cache" subdir
472 RMDir /r "$2\Local Settings\Application Data\Imprudence" 472 RMDir /r "$2\Local Settings\Application Data\meta-impy"
473 # Vista version of the same 473 # Vista version of the same
474 RMDir /r "$2\AppData\Local\Imprudence" 474 RMDir /r "$2\AppData\Local\meta-impy"
475 Delete "$2\Application Data\Imprudence\user_settings\settings_windlight.xml" 475 Delete "$2\Application Data\meta-impy\user_settings\settings_windlight.xml"
476 476
477 CONTINUE: 477 CONTINUE:
478 IntOp $0 $0 + 1 478 IntOp $0 $0 + 1
@@ -483,17 +483,17 @@ Pop $2
483Pop $1 483Pop $1
484Pop $0 484Pop $0
485 485
486; Delete files in Documents and Settings\All Users\Imprudence 486; Delete files in Documents and Settings\All Users\meta-impy
487Push $0 487Push $0
488 ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" 488 ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
489 StrCmp $0 "" +2 489 StrCmp $0 "" +2
490 RMDir /r "$0\Imprudence" 490 RMDir /r "$0\meta-impy"
491Pop $0 491Pop $0
492 492
493; Delete filse in C:\Windows\Application Data\Imprudence 493; Delete filse in C:\Windows\Application Data\meta-impy
494; If the user is running on a pre-NT system, Application Data lives here instead of 494; If the user is running on a pre-NT system, Application Data lives here instead of
495; in Documents and Settings. 495; in Documents and Settings.
496RMDir /r "$WINDIR\Application Data\Imprudence" 496RMDir /r "$WINDIR\Application Data\meta-impy"
497 497
498FunctionEnd 498FunctionEnd
499 499
@@ -503,7 +503,7 @@ FunctionEnd
503;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 503;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
504Function un.CloseSecondLife 504Function un.CloseSecondLife
505 Push $0 505 Push $0
506 FindWindow $0 "Imprudence" "" 506 FindWindow $0 "meta-impy" ""
507 IntCmp $0 0 DONE 507 IntCmp $0 0 DONE
508 MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL 508 MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
509 509
@@ -515,7 +515,7 @@ Function un.CloseSecondLife
515 SendMessage $0 16 0 0 515 SendMessage $0 16 0 0
516 516
517 LOOP: 517 LOOP:
518 FindWindow $0 "Imprudence" "" 518 FindWindow $0 "meta-impy" ""
519 IntCmp $0 0 DONE 519 IntCmp $0 0 DONE
520 Sleep 500 520 Sleep 500
521 Goto LOOP 521 Goto LOOP
@@ -536,7 +536,7 @@ Function un.RemovePassword
536DetailPrint "Removing Second Life password" 536DetailPrint "Removing Second Life password"
537 537
538SetShellVarContext current 538SetShellVarContext current
539Delete "$APPDATA\Imprudence\user_settings\password.dat" 539Delete "$APPDATA\meta-impy\user_settings\password.dat"
540SetShellVarContext all 540SetShellVarContext all
541 541
542FunctionEnd 542FunctionEnd
@@ -758,11 +758,11 @@ SectionEnd ; end of uninstall section
758!macroend 758!macroend
759 759
760Function GetProgramName 760Function GetProgramName
761 !insertmacro GetParameterValue "/P=" "Imprudence" 761 !insertmacro GetParameterValue "/P=" "meta-impy"
762FunctionEnd 762FunctionEnd
763 763
764Function un.GetProgramName 764Function un.GetProgramName
765 !insertmacro GetParameterValue "/P=" "Imprudence" 765 !insertmacro GetParameterValue "/P=" "meta-impy"
766FunctionEnd 766FunctionEnd
767 767
768;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 768;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi
index e45b3b1..5e21cb3 100644
--- a/linden/indra/newview/installers/windows/lang_de.nsi
+++ b/linden/indra/newview/installers/windows/lang_de.nsi
@@ -6,52 +6,52 @@ LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
6LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup" 6LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
7 7
8; description on license page 8; description on license page
9LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen." 9LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte meta-impy mit Version ${VERSION_LONG}. ersetzen."
10LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren." 10LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird meta-impy auf Ihrem Computer installieren."
11LangString LicenseDescNext ${LANG_GERMAN} "Weiter" 11LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
12 12
13; installation directory text 13; installation directory text
14LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner" 14LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
15LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:" 15LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den meta-impy Ordner für dieses Update:"
16LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:" 16LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem meta-impy installieren werden soll:"
17 17
18; CheckStartupParams message box 18; CheckStartupParams message box
19LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen." 19LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
20 20
21; installation success dialog 21; installation success dialog
22LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?" 22LangString InstSuccesssQuestion ${LANG_GERMAN} "meta-impy starten?"
23 23
24; remove old NSIS version 24; remove old NSIS version
25LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..." 25LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."
26 26
27; check windows version 27; check windows version
28LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..." 28LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."
29LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?' 29LangString CheckWindowsVersionMB ${LANG_GERMAN} 'meta-impy unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?'
30 30
31; checkifadministrator function (install) 31; checkifadministrator function (install)
32LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..." 32LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..."
33LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence installieren zu können.' 33LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy installieren zu können.'
34 34
35; checkifadministrator function (uninstall) 35; checkifadministrator function (uninstall)
36LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..." 36LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..."
37LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence entfernen zu können..' 37LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy entfernen zu können..'
38 38
39; checkifalreadycurrent 39; checkifalreadycurrent
40LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?" 40LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist meta-impy ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"
41 41
42; closeimprudence function (install) 42; closeimprudence function (install)
43LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." 43LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..."
44LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." 44LangString CloseSecondLifeInstMB ${LANG_GERMAN} "meta-impy kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
45 45
46; closeimprudence function (uninstall) 46; closeimprudence function (uninstall)
47LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." 47LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..."
48LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." 48LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "meta-impy kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
49 49
50; removecachefiles 50; removecachefiles
51LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen." 51LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."
52 52
53; delete program files 53; delete program files
54LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?" 54LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem meta-impy Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?"
55 55
56; uninstall text 56; uninstall text
57LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen." 57LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird meta-impy ${VERSION_LONG} von Ihrem System entfernen."
diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi
index 0d28c3f..5612418 100644
--- a/linden/indra/newview/installers/windows/lang_en-us.nsi
+++ b/linden/indra/newview/installers/windows/lang_en-us.nsi
@@ -7,46 +7,46 @@ LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
7 7
8; installation directory text 8; installation directory text
9LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 9LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory"
10LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):" 10LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the meta-impy directory to update to version ${VERSION_LONG}.(XXX):"
11LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:" 11LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install meta-impy in:"
12 12
13; CheckStartupParams message box 13; CheckStartupParams message box
14LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed." 14LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
15 15
16; installation success dialog 16; installation success dialog
17LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?" 17LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start meta-impy now?"
18 18
19; remove old NSIS version 19; remove old NSIS version
20LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..." 20LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
21 21
22; check windows version 22; check windows version
23LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..." 23LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
24LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' 24LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'meta-impy only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?'
25 25
26; checkifadministrator function (install) 26; checkifadministrator function (install)
27LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..." 27LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
28LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.' 28LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install meta-impy.'
29 29
30; checkifadministrator function (uninstall) 30; checkifadministrator function (uninstall)
31LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..." 31LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
32LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Imprudence.' 32LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall meta-impy.'
33 33
34; checkifalreadycurrent 34; checkifalreadycurrent
35LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" 35LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that meta-impy ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
36 36
37; closeimprudence function (install) 37; closeimprudence function (install)
38LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." 38LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..."
39LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation." 39LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "meta-impy can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel installation."
40 40
41; closeimprudence function (uninstall) 41; closeimprudence function (uninstall)
42LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." 42LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..."
43LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel." 43LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "meta-impy can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel."
44 44
45; removecachefiles 45; removecachefiles
46LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder" 46LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
47 47
48; delete program files 48; delete program files
49LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" 49LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your meta-impy program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?"
50 50
51; uninstall text 51; uninstall text
52LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Imprudence ${VERSION_LONG} from your system." 52LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall meta-impy ${VERSION_LONG} from your system."
diff --git a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss
index d62e210..9480859 100644
--- a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss
+++ b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss
@@ -8,12 +8,12 @@
8 8
9; These will change 9; These will change
10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} 10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
11AppName=Imprudence Viewer Experimental Release 11AppName=meta-impy Viewer Experimental Release
12AppVerName=Imprudence Viewer 1.4.0 Experimental 2010.09.04 12AppVerName=meta-impy Viewer 1.4.0 Experimental 2010.09.04
13DefaultDirName={pf}\ImprudenceExperimental 13DefaultDirName={pf}\meta-impyExperimental
14DefaultGroupName=Imprudence Viewer Experimental Release 14DefaultGroupName=meta-impy Viewer Experimental Release
15VersionInfoProductName=Imprudence Viewer Experimental Release 15VersionInfoProductName=meta-impy Viewer Experimental Release
16OutputBaseFilename=Imprudence-1.4.0-experimental-2010.09.04-Setup 16OutputBaseFilename=meta-impy-1.4.0-experimental-2010.09.04-Setup
17VersionInfoVersion=1.4.0 17VersionInfoVersion=1.4.0
18VersionInfoTextVersion=1.4.0 18VersionInfoTextVersion=1.4.0
19VersionInfoProductVersion=1.4.0 19VersionInfoProductVersion=1.4.0
@@ -21,7 +21,7 @@ VersionInfoCopyright=2010
21AppCopyright=2010 21AppCopyright=2010
22 22
23; These won't change 23; These won't change
24VersionInfoCompany=Imprudence 24VersionInfoCompany=meta-impy
25AppPublisher=The Imprudence Project 25AppPublisher=The Imprudence Project
26AppPublisherURL=http://www.imprudenceviewer.org 26AppPublisherURL=http://www.imprudenceviewer.org
27AppSupportURL=http://www.imprudenceviewer.org 27AppSupportURL=http://www.imprudenceviewer.org
@@ -35,8 +35,8 @@ InternalCompressLevel=ultra64
35SolidCompression=true 35SolidCompression=true
36PrivilegesRequired=poweruser 36PrivilegesRequired=poweruser
37AllowRootDirectory=true 37AllowRootDirectory=true
38WizardImageFile=..\windows\imprudence_installer_icon_left.bmp 38WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp
39WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp 39WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp
40SetupLogging=true 40SetupLogging=true
41 41
42[Languages] 42[Languages]
@@ -45,12 +45,12 @@ Name: english; MessagesFile: compiler:Default.isl
45[Tasks] 45[Tasks]
46Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce 46Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
47Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce 47Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
48Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce 48Name: slurlassociate; Description: Associate meta-impy with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce
49; TODO: use scripting for something like this on uninstall: 49; TODO: use scripting for something like this on uninstall:
50; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: 50; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall:
51 51
52[Files] 52[Files]
53Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion 53Source: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion
54Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs 54Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs
55Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs 55Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs
56Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs 56Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -66,8 +66,8 @@ Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion
66Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion 66Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion
67Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion 67Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion
68Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion 68Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion
69Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion 69Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion
70Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion 70Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion
71Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion 71Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion
72Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion 72Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion
73Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion 73Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion
@@ -155,31 +155,31 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
155[Registry] 155[Registry]
156Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life 156Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life
157Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol 157Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol
158Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe 158Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe
159Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: 159Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages:
160; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib 160; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib
161; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} 161; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app}
162 162
163[Icons] 163[Icons]
164Name: {group}\{cm:UninstallProgram,Imprudence Experimental}; Filename: {uninstallexe} 164Name: {group}\{cm:UninstallProgram,meta-impy Experimental}; Filename: {uninstallexe}
165Name: {commondesktop}\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 165Name: {commondesktop}\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0
166Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} 166Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}
167Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml 167Name: {group}\meta-impy Experimental; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml
168 168
169[Run] 169[Run]
170Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall 170Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall
171Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different 171Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
172 172
173[UninstallDelete] 173[UninstallDelete]
174Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 174Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages:
175Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: 175Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages:
176Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: 176Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages:
177; 1.2 and lower cache location: 177; 1.2 and lower cache location:
178Name: {userappdata}\Imprudence\cache; Type: filesandordirs 178Name: {userappdata}\meta-impy\cache; Type: filesandordirs
179; 1.3 and higher cache location: 179; 1.3 and higher cache location:
180Name: {localappdata}\Imprudence\cache; Type: filesandordirs 180Name: {localappdata}\meta-impy\cache; Type: filesandordirs
181Name: {userappdata}\Imprudence\logs; Type: filesandordirs 181Name: {userappdata}\meta-impy\logs; Type: filesandordirs
182Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs 182Name: {userappdata}\meta-impy\browser_profile; Type: filesandordirs
183Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs 183Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs
184Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs 184Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
185 185
diff --git a/linden/indra/newview/installers/windows/imprudence installer script.iss b/linden/indra/newview/installers/windows/meta-impy installer script.iss
index 6ea24c6..d203f78 100644
--- a/linden/indra/newview/installers/windows/imprudence installer script.iss
+++ b/linden/indra/newview/installers/windows/meta-impy installer script.iss
@@ -8,12 +8,12 @@
8 8
9; These will change 9; These will change
10AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} 10AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8}
11AppName=Imprudence 11AppName=meta-impy
12AppVerName=Imprudence Viewer 1.3.0 RC2 (SSE2 optimized) 12AppVerName=meta-impy Viewer 1.3.0 RC2 (SSE2 optimized)
13DefaultDirName={pf}\Imprudence 13DefaultDirName={pf}\meta-impy
14DefaultGroupName=Imprudence Viewer 14DefaultGroupName=meta-impy Viewer
15VersionInfoProductName=Imprudence Viewer 15VersionInfoProductName=meta-impy Viewer
16OutputBaseFilename=Imprudence-1.3.0-RC2-(SSE2-optimized)-Setup 16OutputBaseFilename=meta-impy-1.3.0-RC2-(SSE2-optimized)-Setup
17VersionInfoVersion=1.3.0 17VersionInfoVersion=1.3.0
18VersionInfoTextVersion=1.3.0 18VersionInfoTextVersion=1.3.0
19VersionInfoProductVersion=1.3.0 19VersionInfoProductVersion=1.3.0
@@ -21,7 +21,7 @@ VersionInfoCopyright=2010
21AppCopyright=2010 21AppCopyright=2010
22 22
23; These won't change 23; These won't change
24VersionInfoCompany=Imprudence 24VersionInfoCompany=meta-impy
25AppPublisher=The Imprudence Project 25AppPublisher=The Imprudence Project
26AppPublisherURL=http://www.imprudenceviewer.org 26AppPublisherURL=http://www.imprudenceviewer.org
27AppSupportURL=http://www.imprudenceviewer.org 27AppSupportURL=http://www.imprudenceviewer.org
@@ -35,8 +35,8 @@ InternalCompressLevel=ultra64
35SolidCompression=true 35SolidCompression=true
36PrivilegesRequired=poweruser 36PrivilegesRequired=poweruser
37AllowRootDirectory=true 37AllowRootDirectory=true
38WizardImageFile=..\windows\imprudence_installer_icon_left.bmp 38WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp
39WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp 39WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp
40SetupLogging=true 40SetupLogging=true
41 41
42[Languages] 42[Languages]
@@ -45,12 +45,12 @@ Name: english; MessagesFile: compiler:Default.isl
45[Tasks] 45[Tasks]
46Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce 46Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
47Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce 47Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
48Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce 48Name: slurlassociate; Description: Associate meta-impy with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce
49; TODO: use scripting for something like this on uninstall: 49; TODO: use scripting for something like this on uninstall:
50; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: 50; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall:
51 51
52[Files] 52[Files]
53Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion 53Source: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion
54Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs 54Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs
55Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs 55Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs
56Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs 56Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs
@@ -66,8 +66,8 @@ Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion
66Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion 66Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion
67Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion 67Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion
68Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion 68Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion
69Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion 69Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion
70Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion 70Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion
71Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion 71Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion
72Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion 72Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion
73Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion 73Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion
@@ -154,31 +154,31 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
154[Registry] 154[Registry]
155Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life 155Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life
156Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol 156Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol
157Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe 157Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe
158Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: 158Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages:
159; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib 159; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib
160; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} 160; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app}
161 161
162[Icons] 162[Icons]
163Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe} 163Name: {group}\{cm:UninstallProgram,meta-impy}; Filename: {uninstallexe}
164Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 164Name: {commondesktop}\meta-impy; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0
165Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} 165Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}
166Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml 166Name: {group}\meta-impy; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml
167 167
168[Run] 168[Run]
169Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall 169Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall
170Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different 170Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different
171 171
172[UninstallDelete] 172[UninstallDelete]
173Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: 173Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages:
174Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: 174Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages:
175Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: 175Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages:
176; 1.2 and lower cache location: 176; 1.2 and lower cache location:
177Name: {userappdata}\Imprudence\cache; Type: filesandordirs 177Name: {userappdata}\meta-impy\cache; Type: filesandordirs
178; 1.3 and higher cache location: 178; 1.3 and higher cache location:
179Name: {localappdata}\Imprudence\cache; Type: filesandordirs 179Name: {localappdata}\meta-impy\cache; Type: filesandordirs
180Name: {userappdata}\Imprudence\logs; Type: filesandordirs 180Name: {userappdata}\meta-impy\logs; Type: filesandordirs
181Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs 181Name: {userappdata}\meta-impy\browser_profile; Type: filesandordirs
182Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs 182Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs
183Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs 183Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs
184 184
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp
index 79fd407..79fd407 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp
+++ b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp
Binary files differ
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp
index 1c1d5dc..1c1d5dc 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp
+++ b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp
Binary files differ