diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/newview/viewer_manifest.py | |
parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) |
Automated merge
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 849be47088..659da31007 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -488,8 +488,8 @@ class WindowsManifest(ViewerManifest): grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife" - !define SHORTCUT "Second Life" + !define INSTNAME "SecondLifeViewer2" + !define SHORTCUT "Second Life Viewer 2" !define URLNAME "secondlife" Caption "Second Life ${VERSION}" """ @@ -698,7 +698,7 @@ class DarwinManifest(ViewerManifest): def package_finish(self): - channel_standin = 'Second Life' # hah, our default channel is not usable on its own + channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() |