summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorsimon <none@none>2014-11-24 11:26:36 -0800
committersimon <none@none>2014-11-24 11:26:36 -0800
commit47423ad1a0d349f263ab1c2f0ceca299e418bbbc (patch)
tree1c0452d8591ce67a6e33aad776594b6bc7b4570b /indra/newview/app_settings
parentfa7610fea599a98cc6e79d3835a14f8e5ca2b6b1 (diff)
parentfa9097b65f9d89fd0c8bf7b32924f0327a617cdc (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 041e802626..94d3c8a59f 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9500,7 +9500,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>NameTagShowDisplayNames</key>
<map>