summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-14 14:37:38 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-14 14:37:38 -0500
commit852e60859977a6a2b088d8c99ae7350fe3a3d587 (patch)
tree2cc2f438c657cc554c64bc1e6248a4f716b99a29 /indra/newview/app_settings
parent0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff)
parent120733ea0d479f3c0224f94bb17e5dc32194dc9f (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f2684bc96a..4fa1663907 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4051,17 +4051,6 @@
<key>Value</key>
<integer>305</integer>
</map>
- <key>HelpUseLocal</key>
- <map>
- <key>Comment</key>
- <string>If set, always use this for help: skins/default/html/[LANGUAGE]/help-offline/index.html</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>HelpURLFormat</key>
<map>
<key>Comment</key>