diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
| commit | a8470df2c433d2ce0376dde4f1a54b46ba9b01d7 (patch) | |
| tree | 8f05bd3512209d0e4b0f189d4e4f95f06c622514 /indra/newview/res | |
| parent | 10c45691c7c48557f183cc9686f6a5c13c21a29d (diff) | |
| parent | 79131e8a480ab3611ce739717ed84c6ad76aa234 (diff) | |
merge
Diffstat (limited to 'indra/newview/res')
| -rw-r--r-- | indra/newview/res/resource.h | 1 | ||||
| -rw-r--r-- | indra/newview/res/viewerRes.rc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 28813be896..01d90da971 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -38,6 +38,7 @@ #define IDC_CURSOR5 154 #define IDI_LCD_LL_ICON 157 #define IDC_CURSOR6 158 +#define IDC_STATIC 1000 #define IDC_RADIO_56 1000 #define IDC_RADIO_128 1001 #define IDC_RADIO_256 1002 diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 5e8cee1f5f..38d04b4b5c 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "winres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\r\n" + "#include ""windows.h""\r\n" "\0" END |