diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2017-03-10 09:23:35 -0800 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2017-03-10 09:23:35 -0800 |
commit | 8cbaaa364f6bfd01aeb4280689e2f883a5ffed53 (patch) | |
tree | 8ed5772a8e93ec325999c406a958f4c0aa4cc494 /indra | |
parent | 2e011225754192cc35af8438d898da55a8596904 (diff) |
SL-321: add new VMP package, fix llbase path
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index da641e920c..60ee7728ab 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -343,7 +343,7 @@ class WindowsManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - llbasedir = os.path.join(pkgdir, "VMP") + llbasedir = os.path.join(pkgdir, "llbase") if self.is_packaging_viewer(): # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. @@ -743,7 +743,7 @@ class DarwinManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - llbasedir = os.path.join(pkgdir, "VMP") + llbasedir = os.path.join(pkgdir, "llbase") if self.prefix(src="", dst="Contents"): # everything goes in Contents self.path("Info.plist", dst="Info.plist") |