pull back more 3.4.5 beta fixes

.hgtags

@@ -413,3 +413,4 @@ e06898df8644fe567bee94f817d03abc1c380993 3.4.5-beta3
 a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289
 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290
 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291
+b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292

indra/media_plugins/webkit/windows_volume_catcher.cpp

@@ -71,7 +71,7 @@ VolumeCatcherImpl::VolumeCatcherImpl()
 {
 	mSystemIsVistaOrHigher = isWindowsVistaOrHigher();
 
-	if ( mSystemIsVistaOrHigher )
+	if ( ! mSystemIsVistaOrHigher )
 	{
 		HMODULE handle = ::LoadLibrary(L"winmm.dll");
 		if(handle)

indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml

@@ -152,19 +152,6 @@
      width="80">
         Mid
     </text>
-  <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="87"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="80">
-      High
-  </text>
     <text
      type="string"
      length="1"