Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

2013-06-19 12:43:50 -04:00 · 2013-06-19 12:43:50 -04:00 · aa8abe5e1c
parent 2655c7a17a 2b8cd2fccf
commit aa8abe5e1c
1 changed files with 5 additions and 2 deletions
--- a/indra/viewer_components/updater/scripts/linux/update_install
+++ b/indra/viewer_components/updater/scripts/linux/update_install
@ -69,8 +69,11 @@ then # zenity on PATH and is executable
         # clear any previous message
         clear_message
         # put up a new zenity box and capture its pid
-         "$zenpath" --info --title "Second Life Viewer Updater" \
-                    --width=320 --height=120 --text="$*" &
+##       "$zenpath" --info --title "Second Life Viewer Updater" \
+##                  --width=320 --height=120 --text="$*" &
+         # MAINT-2333: use bouncing progress bar
+         "$zenpath" --progress --pulsate --no-cancel --title "Second Life Viewer Updater" \
+                    --width=320 --height=120 --text "$*" </dev/null &
         statuspid=$!
     }