summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-10-29 16:15:57 -0400
committerOz Linden <oz@lindenlab.com>2014-10-29 16:15:57 -0400
commit05896f4f04f6d2335b2a77f6f6a40735d4c5be15 (patch)
tree63f409d9f062c602529152638e4b290376766078 /indra
parentcd0774a2174a5f5ef4871473afd175778db60980 (diff)
parentecba0d552471d005fde077203fd9a8da468faabb (diff)
merge changes for MAINT-4560
Diffstat (limited to 'indra')
-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>