summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-06 16:37:51 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-06 16:37:51 -0500
commit55a812ca7797ec1b857e95254fde1fa75bd92d06 (patch)
treec15fdb992af40162cc5adb3c25257f3ba1f069a1 /indra/newview/app_settings
parentbf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff)
parenta9ea41003587e2411c7247f84ea04df2a686552b (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 5e42fc29f7..f5badb078d 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>