diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/windows_volume_catcher.cpp | 11 | ||||
| -rw-r--r-- | 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 fdff28c2c1..ef96102a0a 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 @@ private: 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 @@ private: 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 a725548e61..20bf618b64 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/ |