summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorsimon <none@none>2014-11-24 11:31:06 -0800
committersimon <none@none>2014-11-24 11:31:06 -0800
commitfa068dffd023f35d161753009e6079edfe2ad012 (patch)
tree1c44c558e8a3dd21de6767eb911b6955579a266b /indra/newview/app_settings
parent8cb6fe2695fae0ae37a042ff052c613702970ddd (diff)
parent47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff)
Merge downstream code and become version 3.7.21
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml2
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>