diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-29 10:56:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-29 10:56:10 -0400 |
| commit | 29401ee50a6db78c46dd5180ce3cb6116e4ead1d (patch) | |
| tree | e9ef428d8bc3465bd240708c193f0cb1986dd435 | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
Fixes for installer, icon names to remove the 2 now that we are on version 3
| -rwxr-xr-x[-rw-r--r--] | BuildParams | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/viewer_manifest.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams index b62d7b7af1..5925cdade9 100644..100755 --- a/BuildParams +++ b/BuildParams @@ -188,4 +188,10 @@ simon_viewer-dev-private.public_build = false simon_viewer-dev-private.email_status_this_is_os = false +# ======================================== +# Vir +# ======================================== +vir-project-1.viewer_channel = "Second Life Release" +vir-project-1.login_channel = "Second Life Release" + # eof diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f0bee2bfee..aea5dc0649 100644..100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -574,9 +574,9 @@ class WindowsManifest(ViewerManifest): OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" !define INSTNAME "SecondLifeViewer2" - !define SHORTCUT "Second Life Viewer 2" + !define SHORTCUT "Second Life Viewer" !define URLNAME "secondlife" - Caption "Second Life ${VERSION}" + Caption "Second Life" """ else: # beta grid viewer @@ -804,7 +804,7 @@ class DarwinManifest(ViewerManifest): self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script)) def package_finish(self): - channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own + channel_standin = 'Second Life Viewer' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() |