aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/win_updater/updater.cpp10
2 files changed, 5 insertions, 10 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2de813a..d0473f0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -66,6 +66,11 @@
66 66
672009-11-18 McCabe Maxsted <hakushakukun@gmail.com> 672009-11-18 McCabe Maxsted <hakushakukun@gmail.com>
68 68
69 * Removed old unused reference to gProductName in windows updater.
70
71 modified: linden/indra/win_updater/updater.cpp
72
73
69 * Cleaned up a harmless bad merge in llimagej2coj.cpp. 74 * Cleaned up a harmless bad merge in llimagej2coj.cpp.
70 75
71 modified: linden/indra/llimagej2coj/llimagej2coj.cpp 76 modified: linden/indra/llimagej2coj/llimagej2coj.cpp
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 9aed612..9d57880 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -350,16 +350,6 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
350 // Parse the command line arguments 350 // Parse the command line arguments
351 // 351 //
352 int parse_args_result = parse_args(argc, argv); 352 int parse_args_result = parse_args(argc, argv);
353 WCHAR window_title[2048];
354 if (gProductName)
355 {
356 mbstowcs(window_title, gProductName, 2048);
357 wcscat(window_title, L" Updater"); /* Flawfinder: ignore */
358 }
359 else
360 {
361 mbstowcs(window_title, "Imprudence Updater", 2048);
362 }
363 353
364 WNDCLASSEX wndclassex = { 0 }; 354 WNDCLASSEX wndclassex = { 0 };
365 DEVMODE dev_mode = { 0 }; 355 DEVMODE dev_mode = { 0 };