From 276800e6f2d4521f6b3a987cf1a4ace95282092d Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 29 Jan 2013 18:09:13 -0500 Subject: MAINT-2281: correct test for XP --- indra/media_plugins/webkit/windows_volume_catcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/media_plugins/webkit') diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp index 957704da47..cc4630c1b8 100644 --- a/indra/media_plugins/webkit/windows_volume_catcher.cpp +++ b/indra/media_plugins/webkit/windows_volume_catcher.cpp @@ -90,7 +90,7 @@ void VolumeCatcherImpl::setVolume(F32 volume) { mVolume = volume; - if ( mSystemIsVistaOrHigher ) + if ( ! mSystemIsVistaOrHigher ) { // set both left/right to same volume // TODO: use pan value to set independently -- cgit v1.2.3 From 2fa8205d4dfea3fd57bcdb2973805d110e38c44f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 29 Jan 2013 18:39:51 -0500 Subject: MAINT-2281: correct test for XP (corrected fix I applied incorrectly) --- indra/media_plugins/webkit/windows_volume_catcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/media_plugins/webkit') diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp index cc4630c1b8..0cfb810906 100644 --- a/indra/media_plugins/webkit/windows_volume_catcher.cpp +++ b/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) @@ -90,7 +90,7 @@ void VolumeCatcherImpl::setVolume(F32 volume) { mVolume = volume; - if ( ! mSystemIsVistaOrHigher ) + if ( mSystemIsVistaOrHigher ) { // set both left/right to same volume // TODO: use pan value to set independently -- cgit v1.2.3