diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
| commit | 6691bf637e71f40d1bf12065c7caaf96bd9aaf50 (patch) | |
| tree | 554b6fbe0bd754f6fc10ee858a66232773c0fb6c /indra/newview/app_settings | |
| parent | c1c087b508813ed0a07693decbab82e1cf3403ed (diff) | |
| parent | 2a869d52f189a31c185b93f6425dd3e3dd8e927f (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33f5482e50..02e9a10fde 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,6 +2567,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>DisableGroupToast</key> + <map> + <key>Comment</key> + <string>Disable Incoming Group Toasts</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>DisableIMToast</key> + <map> + <key>Comment</key> + <string>Disable Incoming IM Toasts</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>DisplayAvatarAgentTarget</key> <map> <key>Comment</key> |