1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1bb3d65e05..38fdaea9d8 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -311,6 +311,16 @@ void set_flags_and_update_appearance()
 // true when all initialization done.
 bool idle_startup()
 {
+    // FIXME asset-http - this configuration stuff is temporary
+    // construction; once it is always on for certain types
+    // and we can remove the setting.
+    static bool va_types_initialized = false;
+    if (!va_types_initialized)
+    {
+        va_types_initialized = true;
+        LLAssetType::setFetchWithVACapConfigString(gSavedSettings.getString("ViewerAssetHttpTypes"));
+    }
+
 	const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
 	static LLTimer timeout;