diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-14 14:42:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-14 14:42:41 -0400 |
| commit | 153d571c5c785256230b2e94825cbf20c611d4c0 (patch) | |
| tree | 5e78b9b5ee059b1df64c8049e97c111273f7a797 /indra/newview/app_settings | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
| parent | 8be5c8eade832796c34f035547cf09095a85d3f4 (diff) | |
merge changes for MAINT-5090
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 7a7498a154..845cb5ae96 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14703,17 +14703,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> |