Added checkbox in preferences > advanced for http textures

2 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 88f066c..12d0823 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -50,6 +50,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
         childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ClothingLayerProtection"));
+        childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
 
         return TRUE;
 }
@@ -59,6 +60,7 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
         gSavedSettings.setBOOL("ClothingLayerProtection", childGetValue("client_name_tag_check"));
+        gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
 
         // This is bad bad BAD UI from Emerald, I know. 
         // If anyone wants to do this better, please do -- MC
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 39a3111..e889026 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -5,7 +5,7 @@
   
   <!-- Start organizing these when we get enough of 'em - MC -->
   
-  <check_box bottom="-20" enabled="true"
+  <check_box bottom="-30" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16"
        initial_value="false" label="Disable Login/Logout Screens" left="12"
        mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
@@ -22,4 +22,8 @@
        font="SansSerifSmall" height="16" initial_value="false"
        label="Enable Shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
        name="shadows_check" radio_style="false" width="217" />
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Use HTTP Textures" left="12" mouse_opaque="true"
+       name="http_texture_check" radio_style="false" width="217" />
 </panel>