diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
| commit | 7f2e4c621ca297af47c67f31ccdf3bddbaae57b7 (patch) | |
| tree | ed00134d5718d0c734809e2da9266361ced06250 /indra/newview/app_settings/settings.xml | |
| parent | da1a39c935d8ef660c35d01bf9d7c53af3adf7ae (diff) | |
| parent | 31220ceffbacdf0f14929b735b0c9e250e1225ca (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f8ad1c2dac..acd3c10ec6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7337,10 +7337,21 @@ <key>Value</key> <integer>1</integer> </map> - <key>NameTagShowSLIDs</key> + <key>NameTagShowFriends</key> <map> <key>Comment</key> - <string>Show Second Life IDs in name labels</string> + <string>Highlight the name tags of your friends</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>NameTagShowUsernames</key> + <map> + <key>Comment</key> + <string>Show usernames in avatar name tags</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |