Pull merge from lindenlab/viewer-release

1 files changed, 7 insertions, 0 deletions

diff --git a/build.sh b/build.sh
index 1fd2cd802b..f908139979 100755
--- a/build.sh
+++ b/build.sh
@@ -401,6 +401,7 @@ then
         if [ x"$package" != x ]
         then
           upload_item installer "$package" binary/octet-stream
+          upload_item quicklink "$package" binary/octet-stream
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -414,6 +415,12 @@ then
           upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
         done
 
+        # Upload the actual dependencies used
+        if [ -r "$build_dir/packages/installed-packages.xml" ]
+        then
+            upload_item installer "$build_dir/packages/installed-packages.xml" text/xml
+        fi
+
         # Upload the llphysicsextensions_tpv package, if one was produced
         # *TODO: Make this an upload-extension
         if [ -r "$build_dir/llphysicsextensions_package" ]