diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:04:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:04:17 -0800 |
| commit | 4790944923bf9c90c21e99e0ba5be994f1e8e1fa (patch) | |
| tree | 32aaafe5db0106e5ba8eaf59042fd17cf697b84b | |
| parent | 8c2087532326871918d152ffbdf4b34c104791da (diff) | |
| parent | c790866e46ad438c38476f33c95db8c5eabfa5c1 (diff) | |
STORM-1067 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bd5a9faf4f..c58994d298 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -239,6 +239,7 @@ Coaldust Numbers VWR-1095 Cron Stardust VWR-10579 + VWR-25120 Cypren Christenson STORM-417 Dale Glass diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1722c84d34..4c4b90855c 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -803,7 +803,7 @@ class DarwinManifest(ViewerManifest): self.run_command('SetFile -a V %r' % pathname) # Create the alias file (which is a resource file) from the .r - self.run_command('rez %r -o %r' % + self.run_command('Rez %r -o %r' % (self.src_path_of("installers/darwin/release-dmg/Applications-alias.r"), os.path.join(volpath, "Applications"))) |