diff --git a/doc/contributions.txt b/doc/contributions.txt
index e7537b608b6ca6f16f31a2f3a3e92ae387091505..aaee3ed03b998bf4462c8683bbf667ee09551140 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -158,6 +158,7 @@ Ann Congrejo
 Ansariel Hiller
 	STORM-1101
 Ardy Lay
+	STORM-859
 	VWR-19499
 	VWR-24917
 Argent Stonecutter
@@ -885,6 +886,7 @@ WolfPup Lowenhar
 	STORM-674
 	STORM-776
 	STORM-825
+	STORM-859
 	STORM-1098
 	VWR-20741
 	VWR-20933
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h
index 28813be8964a2eac987c86805c27403e99d306ff..01d90da971cc5356acea5bb3584aeb451f0e88a5 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 5e8cee1f5fac55c59663020cc3c5f1a37ec449a1..38d04b4b5c5f2ff3e68755e7abfdc4e4fd94f147 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