diff -r 61ac1004521a -r 406284514d4b doc/contributions.txt
--- a/doc/contributions.txt	Thu May 12 21:17:10 2011 +0300
+++ b/doc/contributions.txt	Sun May 15 21:57:27 2011 -0400
@@ -158,6 +158,7 @@
 Ansariel Hiller
 	STORM-1101
 Ardy Lay
+	STORM-859
 	VWR-19499
 	VWR-24917
 Argent Stonecutter
@@ -885,6 +886,7 @@
 	STORM-674
 	STORM-776
 	STORM-825
+	STORM-859
 	STORM-1098
 	VWR-20741
 	VWR-20933
diff -r 61ac1004521a -r 406284514d4b indra/newview/res/resource.h
--- a/indra/newview/res/resource.h	Thu May 12 21:17:10 2011 +0300
+++ b/indra/newview/res/resource.h	Sun May 15 21:57:27 2011 -0400
@@ -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 -r 61ac1004521a -r 406284514d4b indra/newview/res/viewerRes.rc
--- a/indra/newview/res/viewerRes.rc	Thu May 12 21:17:10 2011 +0300
+++ b/indra/newview/res/viewerRes.rc	Sun May 15 21:57:27 2011 -0400
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "winres.h"
+#include "windows.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""winres.h""\r\n"
+    "#include ""windows.h""\r\n"
     "\0"
 END