5 files changed, 14 insertions, 14 deletions

diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 27131ba..597b85b 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -201,9 +201,9 @@ Function RemoveNSIS
   IfErrors NO_NSIS
 
   ; Clean up legacy beta shortcuts
-  Delete "$SMPROGRAMS\Second Life Beta.lnk"
-  Delete "$DESKTOP\Second Life Beta.lnk"
-  Delete "$SMPROGRAMS\Second Life.lnk"
+  Delete "$SMPROGRAMS\meta-impy Beta.lnk"
+  Delete "$DESKTOP\meta-impy Beta.lnk"
+  Delete "$SMPROGRAMS\meta-impy.lnk"
   
   ; Clean up old newview.exe file
   Delete "$INSTDIR\newview.exe"
@@ -533,7 +533,7 @@ FunctionEnd
 ;
 Function un.RemovePassword
 
-DetailPrint "Removing Second Life password"
+DetailPrint "Removing meta-impy password"
 
 SetShellVarContext current
 Delete "$APPDATA\meta-impy\user_settings\password.dat"
diff --git a/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss
index 9480859..7814cb6 100644
--- a/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss
+++ b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss
@@ -153,10 +153,10 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 ;Source: C:\imp_1.3\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages:

 

 [Registry]

-Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life

-Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol

-Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe

-Root: 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: 

+Root: HKCR; Subkey: meta-impy; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life

+Root: HKCR; Subkey: meta-impy; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol

+Root: HKCR; Subkey: meta-impy\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe

+Root: HKCR; Subkey: meta-impy\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages: 

 ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib

 ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app}

 

diff --git a/linden/indra/newview/installers/windows/meta-impy installer script.iss b/linden/indra/newview/installers/windows/meta-impy installer script.iss
index d203f78..376219b 100644
--- a/linden/indra/newview/installers/windows/meta-impy installer script.iss
+++ b/linden/indra/newview/installers/windows/meta-impy installer script.iss
@@ -152,10 +152,10 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 ;Source: C:\imp_1.3\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages:

 

 [Registry]

-Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life

-Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol

-Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe

-Root: 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: 

+Root: HKCR; Subkey: meta-impy; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life

+Root: HKCR; Subkey: meta-impy; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol

+Root: HKCR; Subkey: meta-impy\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe

+Root: HKCR; Subkey: meta-impy\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages: 

 ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib

 ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app}

 

diff --git a/linden/indra/newview/macview.r b/linden/indra/newview/macview.r
index 8124232..b9a1a0d 100644
--- a/linden/indra/newview/macview.r
+++ b/linden/indra/newview/macview.r
@@ -22,7 +22,7 @@ resource 'MENU' (mApple, preload) {
         apple,
         {       /* array: 2 elements */
                 /* [1] */
-                "About Second Life", noIcon, noKey, noMark, plain,
+                "About meta-impy", noIcon, noKey, noMark, plain,
                 /* [2] */
                 "-", noIcon, noKey, noMark, plain
         }
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 2c17b0c..a053861 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -798,7 +798,7 @@ class DarwinManifest(ViewerManifest):
         if ("package" in self.args['actions'] or 
             "unpacked" in self.args['actions']):
             self.run_command('strip -S "%(viewer_binary)s"' %
-                             { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
+                             { 'viewer_binary' : self.dst_path_of('Contents/MacOS/meta-impy')})
 
 
     def package_finish(self):