Connected incoming voice call sound with UI Sounds panels
PanteraPolnocy
parent
7985683413
commit
111b39a12b
|
|
@ -692,11 +692,18 @@ void LLFloater::openFloater(const LLSD& key)
|
|||
&& (!getVisible() || isMinimized()))
|
||||
{
|
||||
//Don't play a sound for incoming voice call based upon chat preference setting
|
||||
bool playSound = !(getName() == "incoming call" && gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall") == FALSE);
|
||||
|
||||
// </FS:PP> UI Sounds
|
||||
// bool playSound = !(getName() == "incoming call" && gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall") == FALSE);
|
||||
bool playSound = !(getName() == "incoming call" && gSavedSettings.getBOOL("PlayModeUISndIncomingVoiceCall") == FALSE);
|
||||
// </FS:PP>
|
||||
|
||||
if(playSound)
|
||||
{
|
||||
make_ui_sound("UISndWindowOpen");
|
||||
// </FS:PP> UI Sounds
|
||||
// make_ui_sound("UISndWindowOpen");
|
||||
make_ui_sound("UISndIncomingVoiceCall");
|
||||
// </FS:PP>
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9318,17 +9318,6 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>PlaySoundIncomingVoiceCall</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Plays a sound when have an incoming voice call.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>PluginAttachDebuggerToPlugins</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -14825,6 +14814,17 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<real>10.0</real>
|
||||
</map>
|
||||
<key>UISndIncomingVoiceCall</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Sound file for incoming voice call (uuid for sound asset)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>c80260ba-41fd-8a46-768a-6bf236360e3a</string>
|
||||
</map>
|
||||
<key>UISndInvalidOp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -19422,6 +19422,17 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>PlayModeUISndIncomingVoiceCall</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Plays a sound when have an incoming voice call. Holds state for Prefs > Sound/Media > UI Sounds - UISndIncomingVoiceCall.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>PlayModeUISndInvalidOp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
|
|||
|
|
@ -3183,6 +3183,62 @@ Hover your mouse cursor over UUID field to show its default value.
|
|||
left_pad="1"
|
||||
width="120" />
|
||||
|
||||
<text
|
||||
layout="topleft"
|
||||
follows="left|top"
|
||||
top_pad="7"
|
||||
left="5"
|
||||
height="14"
|
||||
width="150"
|
||||
tool_tip="Sound UUID played on incoming voice call."
|
||||
name="textFSIncomingVoiceCall">
|
||||
Voice call:
|
||||
</text>
|
||||
<line_editor
|
||||
tool_tip="c80260ba-41fd-8a46-768a-6bf236360e3a"
|
||||
follows="left|top"
|
||||
left_pad="5"
|
||||
height="20"
|
||||
max_length_chars="256"
|
||||
name="UISndIncomingVoiceCall"
|
||||
control_name="UISndIncomingVoiceCall"
|
||||
width="218"/>
|
||||
<button
|
||||
follows="left|top"
|
||||
name="Prev_UISndIncomingVoiceCall"
|
||||
height="20"
|
||||
label="P"
|
||||
layout="topleft"
|
||||
top_delta="-1"
|
||||
left_pad="1"
|
||||
width="17"
|
||||
tool_tip="Preview this sound.">
|
||||
<button.commit_callback
|
||||
function="PreviewUISound"
|
||||
parameter="UISndIncomingVoiceCall"/>
|
||||
</button>
|
||||
<button
|
||||
follows="left|top"
|
||||
name="Def_UISndIncomingVoiceCall"
|
||||
height="20"
|
||||
label="D"
|
||||
layout="topleft"
|
||||
left_pad="1"
|
||||
width="15"
|
||||
tool_tip="Reset to the default UUID.">
|
||||
<button.commit_callback
|
||||
function="ResetControl"
|
||||
parameter="UISndIncomingVoiceCall"/>
|
||||
</button>
|
||||
<check_box
|
||||
control_name="PlayModeUISndIncomingVoiceCall"
|
||||
height="20"
|
||||
label="Play this sound"
|
||||
layout="topleft"
|
||||
name="PlayModeUISndIncomingVoiceCall"
|
||||
left_pad="1"
|
||||
width="120" />
|
||||
|
||||
<text
|
||||
layout="topleft"
|
||||
follows="left|top"
|
||||
|
|
|
|||
|
|
@ -393,6 +393,13 @@ Przytrzymaj kursor myszki ponad polem na UUID, aby zobaczyć jego domyślną war
|
|||
<button name="Def_UISndInventoryOffer" tool_tip="Resetuj do domyślnego UUID."/>
|
||||
<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndInventoryOffer"/>
|
||||
|
||||
<text tool_tip="UUID dźwięku odgrywany, gdy pojawia się nadchodząca rozmowa głosowa." name="textFSIncomingVoiceCall">
|
||||
Rozmowa głosowa:
|
||||
</text>
|
||||
<button name="Prev_UISndIncomingVoiceCall" tool_tip="Podgląd dźwięku."/>
|
||||
<button name="Def_UISndIncomingVoiceCall" tool_tip="Resetuj do domyślnego UUID."/>
|
||||
<check_box label="Odtwarzaj dźwięk" name="PlayModeUISndIncomingVoiceCall"/>
|
||||
|
||||
<text tool_tip="UUID dźwięku odgrywany, gdy rozlega się domyślny odgłos kroków. Zmiana wymaga restartu, aby odniosła skutek." name="textFSFootsteps">
|
||||
Domyślny odgłos kroków:
|
||||
</text>
|
||||
|
|
|
|||
Loading…
Reference in New Issue