summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-11-10 14:43:05 -0500
committerOz Linden <oz@lindenlab.com>2014-11-10 14:43:05 -0500
commitb66c7190607d8e2ac0c3d6c56c41afc81aeb7878 (patch)
treeac6729a3ce4c310a6f55d3a31bee4d852f6dd372 /indra/newview/app_settings
parentfe89c9ed76984214b21d2d37aa10ea83720af5d6 (diff)
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
merge changes for 3.7.20-release
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 b55e72f82a..f2fb9e854f 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>