diff options
| author | simon <none@none> | 2014-11-24 11:31:06 -0800 | 
|---|---|---|
| committer | simon <none@none> | 2014-11-24 11:31:06 -0800 | 
| commit | fa068dffd023f35d161753009e6079edfe2ad012 (patch) | |
| tree | 1c44c558e8a3dd21de6767eb911b6955579a266b /indra/newview/app_settings | |
| parent | 8cb6fe2695fae0ae37a042ff052c613702970ddd (diff) | |
| parent | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff) | |
Merge downstream code and become version 3.7.21
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e269b2dd09..e4e9ed168b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9501,7 +9501,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>0</integer> +      <integer>1</integer>      </map>      <key>NameTagShowDisplayNames</key>      <map> | 
