summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-11-10 14:57:55 -0500
committerMonty Brandenberg <monty@lindenlab.com>2014-11-10 14:57:55 -0500
commitf135fd6f14eabfc08710b5099d1be7aa7a952873 (patch)
tree04d2e50314c29e7c5c1420c0e960e5b2f4f9ecfd /indra/newview/app_settings
parentde9689e39beaea51db07b9ec60ddb106493b5c28 (diff)
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
Merge. Refresh from viewer-release after 3.7.20 released.
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>