Second Life viewer sources 1.19.0.0

1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 35fbf40..5ea4695 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -41,6 +41,7 @@
 #define BUFSIZE 8192
 
 int  gTotalBytesRead = 0;
+DWORD gTotalBytes = -1;
 HWND gWindow = NULL;
 WCHAR gProgress[256];
 char* gUpdateURL;
@@ -129,6 +130,9 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
                 return success;
         }
 
+        DWORD sizeof_total_bytes = sizeof(gTotalBytes);
+        HttpQueryInfo(hdownload, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &gTotalBytes, &sizeof_total_bytes, NULL);
+        
         DWORD total_bytes = 0;
         success = InternetQueryDataAvailable(hdownload, &total_bytes, 0, 0);
         if (success == FALSE)
@@ -187,7 +191,11 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
 
                         gTotalBytesRead += int(bytes_read);
 
-                        wsprintf(gProgress, L"Downloaded: %dK", gTotalBytesRead / 1024);
+                        if (gTotalBytes != -1)
+                                wsprintf(gProgress, L"Downloaded: %d%%", 100 * gTotalBytesRead / gTotalBytes);
+                        else
+                                wsprintf(gProgress, L"Downloaded: %dK", gTotalBytesRead / 1024);
+
                 }
 
 #if _DEBUG