summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2011-05-15 21:57:27 -0400
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2011-05-15 21:57:27 -0400
commitd7d94460d06b959cad5fc12aa72092b89fbd1abc (patch)
tree7963fcd97042aa847310a4b5ee5689d0acbf6d80 /indra/newview
parente8ede07451c65aea898bc3f58a980b6b0d9af302 (diff)
STORM-859 : Replacing winres.h with windows.h so that the viewer will build with-out
having to copy any files to the source tree when useing express versions of Visual Studio.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/res/resource.h1
-rw-r--r--indra/newview/res/viewerRes.rc4
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