From 29401ee50a6db78c46dd5180ce3cb6116e4ead1d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 29 Sep 2011 10:56:10 -0400
Subject: [PATCH] Fixes for installer, icon names to remove the 2 now that we
are on version 3
---
BuildParams | 6 ++++++
indra/newview/viewer_manifest.py | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
mode change 100644 => 100755 BuildParams
mode change 100644 => 100755 indra/newview/viewer_manifest.py
diff --git a/BuildParams b/BuildParams
old mode 100644
new mode 100755
index b62d7b7af11..5925cdade98
--- 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 f0bee2bfee3..aea5dc06491
--- 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()
--
GitLab