diff options
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 11 |
3 files changed, 3 insertions, 23 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 253ac3b836..ece711a128 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6867,17 +6867,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>PlaySoundGroupChatMessages</key> - <map> - <key>Comment</key> - <string>Plays a sound when have a group chat message.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>PlaySoundIncomingVoiceCall</key> <map> <key>Comment</key> diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 581043a3d0..e5dda7e8d8 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -171,8 +171,8 @@ void on_new_message(const LLSD& msg) return; } - // Skip toasting for system messages - if (participant_id.isNull()) + // Skip toasting for system messages and for nearby chat + if (participant_id.isNull() || session_id.isNull()) { return; } diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 0c94b6b223..37bfbae991 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -342,21 +342,12 @@ name="incoming_voice_call" width="150" /> <check_box - enabled="false" - control_name="PlaySoundGroupChatMessages" - height="16" - label="Group chat messages" - layout="topleft" - top_pad="6" - name="group_chat_messages" - width="150" /> - <check_box control_name="PlaySoundTeleportOffer" height="16" label="Teleport offer" layout="topleft" left_pad="35" - top_pad="-59" + top_pad="-38" name="teleport_offer" width="150" /> <check_box |