diff options
| author | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
|---|---|---|
| committer | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
| commit | 2f438a409e7777020269c73df1b6cae83669e664 (patch) | |
| tree | ada6125f611c74283843dedeab981ed538bd8e29 /indra/newview/res | |
| parent | c94062fb5b4d0ddbbd8b623e209d725b50a59851 (diff) | |
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
Diffstat (limited to 'indra/newview/res')
| -rw-r--r-- | indra/newview/res/icon1.ico | bin | 0 -> 766 bytes | |||
| -rw-r--r-- | indra/newview/res/resource.h | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/res/icon1.ico b/indra/newview/res/icon1.ico Binary files differnew file mode 100644 index 0000000000..ad607598fa --- /dev/null +++ b/indra/newview/res/icon1.ico diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index c7e1552dff..e4d01b1050 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -19,6 +19,7 @@ #define IDB_LOGIN 149 #define IDC_CURSOR4 153 #define IDC_CURSOR5 154 +#define IDI_LCD_LL_ICON 157 #define IDC_RADIO_56 1000 #define IDC_RADIO_128 1001 #define IDC_RADIO_256 1002 @@ -151,7 +152,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 156 +#define _APS_NEXT_RESOURCE_VALUE 167 #define _APS_NEXT_COMMAND_VALUE 40002 #define _APS_NEXT_CONTROL_VALUE 1139 #define _APS_NEXT_SYMED_VALUE 101 |