diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:38:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:38:42 -0400 |
| commit | dd69516213fdf20cbc254214e651c4df26afbff7 (patch) | |
| tree | e880c4e88c1ca721dcec028534fc528eda72995c /indra/newview/app_settings/settings.xml | |
| parent | 69ae08acc949789daeff2c214eb569082e171fa9 (diff) | |
| parent | 068e3cc469793c75b0d54ef0864388582bb3b63c (diff) | |
pull fix for STORM-376
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d4a93f1f9b..eb582da801 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7965,7 +7965,7 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderShowGroupTitleAll</key> + <key>NameTagShowGroupTitles</key> <map> <key>Comment</key> <string>Show group titles in name labels</string> @@ -7974,6 +7974,39 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> + <integer>0</integer> + </map> + <key>NameTagShowDisplayNames</key> + <map> + <key>Comment</key> + <string>Show display names in name labels</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>NameTagShowFriends</key> + <map> + <key>Comment</key> + <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> + <string>Boolean</string> + <key>Value</key> <integer>1</integer> </map> <key>RenderInitError</key> @@ -8272,7 +8305,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>RenderUseTriStrips</key> <map> @@ -11035,6 +11068,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>UseDisplayNames</key> + <map> + <key>Comment</key> + <string>Use new, changeable, unicode names</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>UseEnergy</key> <map> <key>Comment</key> |