diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/app_settings/settings.xml | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 40e9b01b45..7e687a5e64 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -38,6 +38,22 @@ <real>1</real> </array> </map> + <key>IMChatColor</key> + <map> + <key>Comment</key> + <string>Color of instant messages from other residents</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Color4</string> + <key>Value</key> + <array> + <real>1</real> + <real>1</real> + <real>1</real> + <real>1</real> + </array> + </map> <key>AllowIdleAFK</key> <map> <key>Comment</key> @@ -8992,6 +9008,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>WarnFirstMedia</key> + <map> + <key>Comment</key> + <string>Enables FirstMedia warning dialog</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>WarnFirstAttach</key> <map> <key>Comment</key> |