livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add UI Sound setting for closing script dialogs

master
Zi Ree 2025-12-16 18:52:15 +01:00
parent c26d037f11
commit 5bb91bbae2
5 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/llfloater.cpp
View File

@ -797,9 +797,19 @@ void LLFloater::closeFloater(bool app_quitting)
&& !getHost()
&& !app_quitting
&& floaterName != "toast") // <FS:PP> FIRE-10373 / BUG-6437
{
// <FS:Zi> UI Sounds connection
// make_ui_sound("UISndWindowClose");
if (getName() == "script_floater")
{
make_ui_sound("UISndScriptFloaterClose");
}
else
{
make_ui_sound("UISndWindowClose");
}
// </FS:Zi>
}
gFocusMgr.clearLastFocusForGroup(this);

22
indra/newview/app_settings/settings.xml
View File

@ -16979,6 +16979,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>c80260ba-41fd-8a46-768a-6bf236360e3a</string>
</map>
<key>UISndScriptFloaterClose</key>
<map>
<key>Comment</key>
<string>Sound file for closing a script dialog (uuid for sound asset)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>2c346eda-b60c-ab33-1119-b8941916a499</string>
</map>
<key>UISpinctrlBtnHeight</key>
<map>
<key>Comment</key>
@ -22747,6 +22758,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>PlayModeUISndScriptFloaterClose</key>
<map>
<key>Comment</key>
<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndScriptFloaterClose.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<!-- End: Prefs > Sound/Media => UI Sounds -->
<key>FSShowMyOwnVoiceVisualizer</key>
<map>

12
indra/newview/app_settings/settings_phoenix.xml
View File

@ -507,6 +507,18 @@
<integer>0</integer>
</map>
<key>PlayModeUISndScriptFloaterClose</key>
<map>
<key>Comment</key>
<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndScriptFloaterClose.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSLegacyNotificationWell</key>
<map>
<key>Comment</key>

1
indra/newview/llvieweraudio.cpp
View File

@ -435,6 +435,7 @@ void init_audio()
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatMention")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndRestartOpenSim"))); // <FS:Ansariel> Preload OpenSim restart sound
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndScriptFloaterOpen"))); // <FS:PP> Separate sound for opening script dialogs
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndScriptFloaterClose"))); // <FS:Zi> Separate sound for closing script dialogs
// <FS:Zi> Pie menu
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuAppear")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndPieMenuHide")));

58
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -3146,7 +3146,7 @@ Hover your mouse cursor over UUID field to show its default value.
width="150"
tool_tip="Sound UUID played when script opens a dialog window."
name="textFSScriptFloaterOpen">
Script dialog:
Script dialog opens:
</text>
<line_editor
follows="left|top"
@ -3193,6 +3193,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 when script closes a dialog window."
name="textFSScriptFloaterClose">
Script dialog closes:
</text>
<line_editor
follows="left|top"
left_pad="5"
height="20"
max_length_chars="256"
name="UISndScriptFloaterClose"
control_name="UISndScriptFloaterClose"
width="218"/>
<button
follows="left|top"
name="Prev_UISndScriptFloaterClose"
height="20"
label="P"
layout="topleft"
top_delta="-1"
left_pad="1"
width="17"
sound_flags="0"
tool_tip="Preview this sound.">
<button.commit_callback
function="PreviewUISound"
parameter="UISndScriptFloaterClose"/>
</button>
<button
follows="left|top"
name="Def_UISndScriptFloaterClose"
height="20"
label="D"
layout="topleft"
left_pad="1"
width="17"
tool_tip="Reset to the default UUID.">
<button.commit_callback
function="ResetControl"
parameter="UISndScriptFloaterClose"/>
</button>
<check_box
control_name="PlayModeUISndScriptFloaterClose"
height="20"
label="Play this sound"
layout="topleft"
name="PlayModeUISndScriptFloaterClose"
left_pad="1"
width="120" />
<text
layout="topleft"
follows="left|top"