From 8cbaaa364f6bfd01aeb4280689e2f883a5ffed53 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Fri, 10 Mar 2017 09:23:35 -0800
Subject: SL-321: add new VMP package, fix llbase path

---
 autobuild.xml                    | 8 ++++----
 indra/newview/viewer_manifest.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 2f7ad05ecd..3b204f6778 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3042,9 +3042,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b7a7d155a70413bce9a7a25ad54c37e7</string>
+              <string>7a3628c40ece889413cc6991d31752ab</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3073/7235/viewer_manager-1.0-darwin64-503061.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3208/7750/viewer_manager-1.0-darwin64-503197.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3054,9 +3054,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0c1a369a3e5ed6363a306e6135797851</string>
+              <string>607b45e6d5e206594fcf8e7ed5783d49</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3074/7241/viewer_manager-1.0-windows-503061.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3209/7756/viewer_manager-1.0-windows-503197.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
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")
-- 
cgit v1.2.3