diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-27 11:14:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-27 11:14:18 -0700 |
| commit | 026db0511f4706ffa7c817ca98ca8a2a68ab5098 (patch) | |
| tree | c45a97098585066d6e6c0af4345725249fd1a5b5 /indra/newview/app_settings | |
| parent | d631f2fd4daed5e3b10fc6dc290aa16f3d0591f0 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4f258a5cf5..1b53a06a85 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14725,17 +14725,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>UseHTTPInventory</key> - <map> - <key>Comment</key> - <string>Allow use of http inventory transfers instead of UDP</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>ClickToWalk</key> <map> <key>Comment</key> |