diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-01 22:02:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-01 22:02:29 -0700 |
| commit | 94c41b2c00230a9514530bcd70efbe6f057a4e13 (patch) | |
| tree | 405f551169b41126b5d9c93a483e8b4692916cf7 /indra/newview/app_settings | |
| parent | 44f6b6ea47e843e10bcc3ce94f2c1aaa8f7f24fb (diff) | |
| parent | d3bc9b3e752935bffc5e808fd41a43af45568788 (diff) | |
STORM-255 : merge with 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 7172f0359a..e5656c0877 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>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> |