From a1b765189d4b8bfb6ec99bc5e5c0a2cc4c9ccbd2 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 28 Apr 2010 19:06:08 -0700
Subject: [PATCH] fix for media not working in release builds
reviewed by Mani
---
indra/media_plugins/webkit/windows_volume_catcher.cpp | 11 ++++-------
indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp
index fdff28c2c17..ef96102a0a9 100644
--- a/indra/media_plugins/webkit/windows_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/windows_volume_catcher.cpp
@@ -34,7 +34,6 @@
#include "volume_catcher.h"
#include <windows.h>
#include "llsingleton.h"
-
class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
{
friend LLSingleton<VolumeCatcherImpl>;
@@ -48,8 +47,8 @@ friend LLSingleton<VolumeCatcherImpl>;
VolumeCatcherImpl();
~VolumeCatcherImpl();
- typedef void (*set_volume_func_t)(F32);
- typedef void (*set_mute_func_t)(bool);
+ typedef void (WINAPI *set_volume_func_t)(F32);
+ typedef void (WINAPI *set_mute_func_t)(bool);
set_volume_func_t mSetVolumeFunc;
set_mute_func_t mSetMuteFunc;
@@ -57,7 +56,6 @@ friend LLSingleton<VolumeCatcherImpl>;
F32 mVolume;
F32 mPan;
};
-
VolumeCatcherImpl::VolumeCatcherImpl()
: mVolume(1.0f), // default volume is max
mPan(0.f) // default pan is centered
@@ -77,10 +75,8 @@ VolumeCatcherImpl::~VolumeCatcherImpl()
void VolumeCatcherImpl::setVolume(F32 volume)
{
- //F32 left_volume = volume * min(1.f, 1.f - mPan);
- //F32 right_volume = volume * max(0.f, 1.f + mPan);
-
mVolume = volume;
+
if (mSetMuteFunc)
{
mSetMuteFunc(volume == 0.f);
@@ -123,3 +119,4 @@ void VolumeCatcher::pump()
// No periodic tasks are necessary for this implementation.
}
+
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a725548e61e..20bf618b641 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -13,7 +13,7 @@ top="600"
</panel.string>
<panel.string
name="real_url" translate="false">
- http://secondlife.com/app/login/
+ http://www.yahoo.com/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/
--
GitLab