diff --git a/BuildParams b/BuildParams old mode 100644 new mode 100755 index b62d7b7af1133954e6cc90ab3721e26f9877aa38..5925cdade98321cd8f54390bf811ba37ced93d28 --- 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 old mode 100644 new mode 100755 index f0bee2bfee3730dfc2eb1e87dfe4fa95715b470c..aea5dc06491a595531d67f9342da075537459785 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -574,9 +574,9 @@ def package_finish(self): 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 @@ def copy_finish(self): 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()