From 173de071f6948698a9aba0380dcfe45b730897c1 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 15 May 2015 03:51:57 -0400 Subject: [PATCH 01/47] There is no wind under water. --- indra/newview/llvieweraudio.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 164419dce..603150f99 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -245,13 +245,13 @@ void audio_update_wind(bool fade) static LLCachedControl MuteWind(gSavedSettings, "MuteWind", false); static LLCachedControl ContinueFlying(gSavedSettings, "LiruContinueFlyingOnUnsit", false); - // mute wind entirely when the user asked or when the user is seated, but flying - if (MuteWind || (ContinueFlying && gAgentAvatarp && gAgentAvatarp->isSitting())) + // mute wind entirely when the user asked or when the user is seated, but flying or just when the user is under water + if (!gAgentAvatarp || MuteWind || (ContinueFlying && gAgentAvatarp->isSitting()) || gAgentAvatarp->mBelowWater) { gAudiop->mMaxWindGain = 0.f; } // mute wind when not /*flying*/ in air - else if /*(gAgent.getFlying())*/ (gAgentAvatarp && gAgentAvatarp->mInAir) + else if (/*gAgent.getFlying()*/gAgentAvatarp->mInAir) { // volume increases by volume_delta, up to no more than max_wind_volume gAudiop->mMaxWindGain = llmin(gAudiop->mMaxWindGain + volume_delta, max_wind_volume); From f79b28117d0e44ad27485939f86836c5b2f6eb10 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 15 May 2015 06:34:24 -0400 Subject: [PATCH 02/47] translate preview flyout_button where button was previously translated. --- indra/newview/skins/default/xui/de/floater_preview_gesture.xml | 2 +- indra/newview/skins/default/xui/es/floater_preview_gesture.xml | 2 +- indra/newview/skins/default/xui/fr/floater_preview_gesture.xml | 2 +- indra/newview/skins/default/xui/it/floater_preview_gesture.xml | 2 +- indra/newview/skins/default/xui/pt/floater_preview_gesture.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml index 4158a7255..233aa8b58 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml @@ -39,6 +39,6 @@ ein. -