diff options
author | McCabe Maxsted | 2010-10-08 23:04:22 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-10-08 23:04:22 -0700 |
commit | e1ecd0c7428c65afd920a37eb61c70773b8d85fc (patch) | |
tree | b6d9e23d5cc652c2e1f98d52e85418a179be7500 /linden/indra/newview/app_settings/settings.xml | |
parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
parent | Implemented friends tags highlighting, including preferences->general checkbo... (diff) | |
download | meta-impy-e1ecd0c7428c65afd920a37eb61c70773b8d85fc.zip meta-impy-e1ecd0c7428c65afd920a37eb61c70773b8d85fc.tar.gz meta-impy-e1ecd0c7428c65afd920a37eb61c70773b8d85fc.tar.bz2 meta-impy-e1ecd0c7428c65afd920a37eb61c70773b8d85fc.tar.xz |
Merge remote branch 'elektra/weekly' into weekly
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index b38bf9a..d33285d 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -10926,6 +10926,17 @@ | |||
10926 | <key>Value</key> | 10926 | <key>Value</key> |
10927 | <integer>1</integer> | 10927 | <integer>1</integer> |
10928 | </map> | 10928 | </map> |
10929 | <key>HighlightFriends</key> | ||
10930 | <map> | ||
10931 | <key>Comment</key> | ||
10932 | <string>Display avatar name text in bold if is a friend</string> | ||
10933 | <key>Persist</key> | ||
10934 | <integer>1</integer> | ||
10935 | <key>Type</key> | ||
10936 | <string>Boolean</string> | ||
10937 | <key>Value</key> | ||
10938 | <integer>1</integer> | ||
10939 | </map> | ||
10929 | <key>SnapEnabled</key> | 10940 | <key>SnapEnabled</key> |
10930 | <map> | 10941 | <map> |
10931 | <key>Comment</key> | 10942 | <key>Comment</key> |