diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
| commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
| tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/viewer_manifest.py | |
| parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
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 3f379fcf75..18ac10fe38 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -479,8 +479,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}" """ @@ -686,7 +686,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() |