diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a54230c98c1b57cb8350589d10aecfe1c16b8fa0..91f47beb2681319de7ac286579f406070b694b63 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5306,7 +5306,7 @@ <key>ImagePipelineUseHTTP</key> <map> <key>Comment</key> - <string>If TRUE use HTTP GET to fetch textures from the server</string> + <string>[OBSOLETE]</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 84f723941dc42fe9a15e5b1c6bd32b1d18a21ebd..a4bfd6372e44403508e0b061ebf95185039691af 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1294,10 +1294,8 @@ bool LLTextureFetchWorker::doWork(S32 param) } } - static LLCachedControl<bool> use_http(gSavedSettings, "ImagePipelineUseHTTP", true); - // if (mHost.isInvalid()) get_url = false; - if ( use_http && mCanUseHTTP && mUrl.empty())//get http url. + if (mCanUseHTTP && mUrl.empty())//get http url. { LLViewerRegion* region = NULL; if (mHost.isInvalid()) diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ee4960de19a9cf2ec331d7765cac3b99f3ac2d16..afa69bb766cb9911f15b392421baff64eccf4076 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -4363,17 +4363,6 @@ function="World.EnvPreset" </menu> <menu_item_separator/> - - <menu_item_check - label="HTTP Textures" - name="HTTP Textures"> - <menu_item_check.on_check - function="CheckControl" - parameter="ImagePipelineUseHTTP" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="ImagePipelineUseHTTP" /> - </menu_item_check> <menu_item_call label="Compress Images" name="Compress Images">