Merge branch 'master' into DRTVWR-521-maint

# Conflicts:
#	indra/newview/llappviewer.cpp

1 files changed, 2 insertions, 0 deletions

diff --git a/build.sh b/build.sh
index 545c913f92..3b0cf97731 100755
--- a/build.sh
+++ b/build.sh
@@ -480,10 +480,12 @@ then
       fi
 
       # Run upload extensions
+      # Ex: bugsplat
       if [ -d ${build_dir}/packages/upload-extensions ]; then
           for extension in ${build_dir}/packages/upload-extensions/*.sh; do
               begin_section "Upload Extension $extension"
               . $extension
+              [ $? -eq 0 ] || fatal "Upload of extension $extension failed"
               end_section "Upload Extension $extension"
           done
       fi