diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-04 10:32:58 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-04 10:32:58 -0400 |
| commit | c24586756954107218b6a85b480732c46444a02a (patch) | |
| tree | ba410d561dd5cbe53574c313380c676b16e0db0c /indra/newview/app_settings | |
| parent | 89f191cd68c54f1d6f46d7d8d4011df180c9de8d (diff) | |
| parent | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (diff) | |
Automated merge up from 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 33c6c939d4..3f23fee865 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2578,6 +2578,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>EnableGroupChatPopups</key> + <map> + <key>Comment</key> + <string>Enable Incoming Group Chat Popups</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>EnableIMChatPopups</key> + <map> + <key>Comment</key> + <string>Enable Incoming IM Chat Popups</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>DisplayAvatarAgentTarget</key> <map> <key>Comment</key> |