diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 22 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 27 |
2 files changed, 49 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 745addd451..84da27e493 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6063,6 +6063,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>StreamNotificationChannel</key> + <map> + <key>Comment</key> + <string>Custom stream notification channel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>157157</integer> + </map> + <key>StreamNotificationChannelEnabled</key> + <map> + <key>Comment</key> + <string>Use the stream notification channel?</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ParticipantListShowIcons</key> <map> <key>Comment</key> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index eb38f8bff3..b5ca1db417 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -406,6 +406,33 @@ name="autoplay_ask" value="2"/> </combo_box> + <check_box + control_name="StreamNotificationChannelEnabled" + height="16" + label="Custom stream notification channel" + layout="topleft" + left="20" + name="stream_notification_channel_enabled" + top_pad="10" + width="256"> + </check_box> + <spinner + control_name="StreamNotificationChannel" + enabled_control="StreamNotificationChannelEnabled" + decimal_digits="0" + follows="left|top" + height="23" + increment="1" + initial_value="157157" + label="Channel number:" + label_width="105" + layout="topleft" + left="260" + max_val="2147483647" + min_val="-2147483648" + name="stream_notification_channel" + top_pad="-15" + width="170" /> <text type="string" length="1" |