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

FIRE-2731: Online/offline sound alerts for friends; proper button disabling in UI sounds panel for object deletion

PanteraPolnocy 2012-09-27 22:07:45 +02:00
parent a8b91aa5a9
commit acc823f712
7 changed files with 204 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14033,6 +14033,28 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>UISndFriendOffline</key>
<map>
<key>Comment</key>
<string>Sound file for friends going offline (uuid for sound asset)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>ed124764-705d-d497-167a-182cd9fa2e6c</string>
</map>
<key>UISndFriendOnline</key>
<map>
<key>Comment</key>
<string>Sound file for friends coming online (uuid for sound asset)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>ed124764-705d-d497-167a-182cd9fa2e6c</string>
</map>
<key>UISndHealthReductionF</key>
<map>
<key>Comment</key>
@ -18354,6 +18376,28 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>PlayModeUISndFriendOffline</key>
<map>
<key>Comment</key>
<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndFriendOffline.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PlayModeUISndFriendOnline</key>
<map>
<key>Comment</key>
<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndFriendOnline.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PlayModeUISndHealthReductionF</key>
<map>
<key>Comment</key>
@ -18462,7 +18506,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>PlayModeUISndObjectRezIn</key>
<map>

2
indra/newview/llcallingcard.cpp
View File

@ -673,6 +673,7 @@ void LLAvatarTracker::processOnlineNotification(LLMessageSystem* msg, void**)
{
lldebugs << "LLAvatarTracker::processOnlineNotification()" << llendl;
instance().processNotify(msg, true);
make_ui_sound("UISndFriendOnline"); // <FS:PP> FIRE-2731: Online/offline sound alert for friends
}
// static
@ -680,6 +681,7 @@ void LLAvatarTracker::processOfflineNotification(LLMessageSystem* msg, void**)
{
lldebugs << "LLAvatarTracker::processOfflineNotification()" << llendl;
instance().processNotify(msg, false);
make_ui_sound("UISndFriendOffline"); // <FS:PP> FIRE-2731: Online/offline sound alert for friends
}
void LLAvatarTracker::processChange(LLMessageSystem* msg)

4
indra/newview/llfloaterpreference.cpp
View File

@ -1929,6 +1929,8 @@ void LLFloaterPreference::updateUISoundsControls()
getChild<LLComboBox>("PlayModeUISndBadKeystroke")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndBadKeystroke"));
getChild<LLComboBox>("PlayModeUISndClick")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndClick"));
getChild<LLComboBox>("PlayModeUISndClickRelease")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndClickRelease"));
getChild<LLComboBox>("PlayModeUISndFriendOffline")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndFriendOffline"));
getChild<LLComboBox>("PlayModeUISndFriendOnline")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndFriendOnline"));
getChild<LLComboBox>("PlayModeUISndHealthReductionF")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndHealthReductionF"));
getChild<LLComboBox>("PlayModeUISndHealthReductionM")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndHealthReductionM"));
getChild<LLComboBox>("PlayModeUISndInvalidOp")->setValue((int)gSavedSettings.getBOOL("PlayModeUISndInvalidOp"));
@ -1962,7 +1964,7 @@ void LLFloaterPreference::updateUISoundsControls()
getChild<LLComboBox>("WhenPlayGroupIM")->setValue((int)gSavedSettings.getU32("PlayModeUISndNewIncomingGroupIMSession")); // 0, 1, 2
// This sound is unused in Firestorm at the moment
getChild<LLUICtrl>("UISndObjectDelete")->setEnabled(FALSE);
getChild<LLComboBox>("Def_UISndObjectDelete")->setEnabled(FALSE);
getChild<LLButton>("Def_UISndObjectDelete")->setEnabled(FALSE);
getChild<LLComboBox>("PlayModeUISndObjectDelete")->setEnabled(FALSE);
}
// </FS:PP>

31
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
View File

@ -216,6 +216,37 @@
left_pad="0"
name="OnlineOfflinetoNearbyChatHistory"
width="180" />
<text
type="string"
length="1"
follows="top|left"
height="15"
layout="topleft"
left="10"
top_pad="10"
name="friends_logon_sounds_label"
width="400">
Play a sound when my friends:
</text>
<check_box
control_name="PlayModeUISndFriendOnline"
name="friends_notify_online_sound"
label="Log in"
layout="topleft"
left="10"
top_pad="2"
height="16"
width="85" />
<check_box
control_name="PlayModeUISndFriendOffline"
name="friends_notify_offline_sound"
label="Log out"
layout="topleft"
left_pad="0"
height="18"
width="85" />
</panel>
<!-- Alerts -->

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

@ -2576,6 +2576,108 @@ Hover your mouse cursor over UUID field to show its default value.
value="0"/>
</combo_box>
<text
layout="topleft"
follows="left|top"
top_pad="7"
left="5"
height="14"
width="150"
tool_tip="Sound UUID played, when your friend comes online."
name="textFSFriendOnline">
Friend comes online:
</text>
<line_editor
tool_tip="ed124764-705d-d497-167a-182cd9fa2e6c"
follows="left|top"
left_pad="5"
height="20"
max_length_chars="256"
name="UISndFriendOnline"
control_name="UISndFriendOnline"
width="230"/>
<button
follows="left|top"
name="Def_UISndFriendOnline"
height="20"
label="D"
layout="topleft"
top_delta="-1"
left_pad="1"
width="20"
tool_tip="Reset to the default UUID.">
<button.commit_callback
function="ResetControl"
parameter="UISndFriendOnline"/>
</button>
<combo_box
control_name="PlayModeUISndFriendOnline"
height="20"
layout="topleft"
left_pad="1"
name="PlayModeUISndFriendOnline"
width="120">
<combo_box.item
label="Play this sound"
name="1"
value="1"/>
<combo_box.item
label="Mute this sound"
name="0"
value="0"/>
</combo_box>
<text
layout="topleft"
follows="left|top"
top_pad="7"
left="5"
height="14"
width="150"
tool_tip="Sound UUID played, when your friend goes offline."
name="textFSFriendOffline">
Friend goes offline:
</text>
<line_editor
tool_tip="ed124764-705d-d497-167a-182cd9fa2e6c"
follows="left|top"
left_pad="5"
height="20"
max_length_chars="256"
name="UISndFriendOffline"
control_name="UISndFriendOffline"
width="230"/>
<button
follows="left|top"
name="Def_UISndFriendOffline"
height="20"
label="D"
layout="topleft"
top_delta="-1"
left_pad="1"
width="20"
tool_tip="Reset to the default UUID.">
<button.commit_callback
function="ResetControl"
parameter="UISndFriendOffline"/>
</button>
<combo_box
control_name="PlayModeUISndFriendOffline"
height="20"
layout="topleft"
left_pad="1"
name="PlayModeUISndFriendOffline"
width="120">
<combo_box.item
label="Play this sound"
name="1"
value="1"/>
<combo_box.item
label="Mute this sound"
name="0"
value="0"/>
</combo_box>
</panel>
</tab_container>
</panel>

5
indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
View File

@ -25,6 +25,11 @@
<check_box label="W tostach" name="friends_online_notify_checkbox"/>
<check_box name="OnlineOfflinetoNearbyChat" label="W czacie lokalnym i konsoli"/>
<check_box label="Tylko w czacie lokalnym" name="OnlineOfflinetoNearbyChatHistory"/>
<text name="friends_logon_sounds_label">
Odtwórz dźwięk gdy moi znajomi:
</text>
<check_box label="Logują się" name="friends_notify_online_sound"/>
<check_box label="Wylogowywują się" name="friends_notify_offline_sound"/>
</panel>
<panel label="Ostrzeżenia" name="tab-alerts">
<text name="show_label">

16
indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
View File

@ -356,6 +356,22 @@ Przytrzymaj kursor myszki ponad polem na UUID, aby zobaczyć jego domyślną war
<combo_box.item label="Odtwórz dźwięk" name="1"/>
<combo_box.item label="Wycisz dźwięk" name="0"/>
</combo_box>
<text tool_tip="UUID dźwięku odgrywany, gdy loguje się znajomy." name="textFSFriendOnline">
Znajomy się loguje:
</text>
<button name="Def_UISndFriendOnline" tool_tip="Resetuj do domyślnego UUID."/>
<combo_box name="PlayModeUISndFriendOnline">
<combo_box.item label="Odtwórz dźwięk" name="1"/>
<combo_box.item label="Wycisz dźwięk" name="0"/>
</combo_box>
<text tool_tip="UUID dźwięku odgrywany, gdy wylogowywuje się znajomy." name="textFSFriendOffline">
Znajomy się wylogowywuje:
</text>
<button name="Def_UISndFriendOffline" tool_tip="Resetuj do domyślnego UUID."/>
<combo_box name="PlayModeUISndFriendOffline">
<combo_box.item label="Odtwórz dźwięk" name="1"/>
<combo_box.item label="Wycisz dźwięk" name="0"/>
</combo_box>
</panel>
</tab_container>
</panel>