From 487930b14e06d67ffce90f44b9f6c1cff71f4db8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 29 Nov 2009 03:44:40 -0700 Subject: Make sure windows always uses the Imprudence icon --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/res/imp_icon.ico | Bin 0 -> 533678 bytes linden/indra/newview/res/viewerRes.rc | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 linden/indra/newview/res/imp_icon.ico diff --git a/ChangeLog.txt b/ChangeLog.txt index 595d2c6..e26777d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-11-29 McCabe Maxsted + + * Make sure windows always uses the Imprudence icon. + + new file: linden/indra/newview/res/imp_icon.ico + modified: linden/indra/newview/res/viewerRes.rc + + 2009-11-28 Jacek Antonelli * Compile flag "-Wno-non-virtual-dtor" is for C++, not C. diff --git a/linden/indra/newview/res/imp_icon.ico b/linden/indra/newview/res/imp_icon.ico new file mode 100644 index 0000000..3b1250a Binary files /dev/null and b/linden/indra/newview/res/imp_icon.ico differ diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 5e57841..18d8d55 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -61,8 +61,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_LL_ICON ICON "ll_icon.ico" -IDI_LCD_LL_ICON ICON "icon1.ico" +IDI_LL_ICON ICON "imp_icon.ico" +//IDI_LCD_LL_ICON ICON "icon1.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Sans Serif" BEGIN ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 - LTEXT "Loading Second Life...",666,36,13,91,8 + LTEXT "Loading Imprudence...",666,36,13,91,8 END -- cgit v1.1