MAINT-7195 work (can't repro), removed UDP fetching path, handle more possible timing issues while connecting to region

2 files changed, 1 insertions, 94 deletions

diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 6ecc2ec740..5e8129b9b2 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -51,8 +51,7 @@ struct AssetEntry : public LLDictionaryEntry
 		mHumanName(human_name),
 		mCanLink(can_link),
 		mCanFetch(can_fetch),
-		mCanKnow(can_know),
-        mFetchWithVACap(false)
+		mCanKnow(can_know)
 	{
 		llassert(strlen(mTypeName) <= 8);
 	}
@@ -62,7 +61,6 @@ struct AssetEntry : public LLDictionaryEntry
 	bool mCanLink;
 	bool mCanFetch;
 	bool mCanKnow;
-    bool mFetchWithVACap;
 };
 
 class LLAssetDictionary : public LLSingleton<LLAssetDictionary>,
@@ -256,89 +254,3 @@ bool LLAssetType::lookupIsAssetIDKnowable(EType asset_type)
 	}
 	return false;
 }
-
-// static
-bool LLAssetType::lookupFetchWithVACap(EType asset_type)
-{
-	LLAssetDictionary *dict = LLAssetDictionary::getInstance();
-	const AssetEntry *entry = dict->lookup(asset_type);
-	if (entry)
-	{
-		return entry->mFetchWithVACap;
-	}
-	return false;
-}
-
-// FIXME asset-http yank all this after asset-http becomes universal
-void LLAssetType::setFetchWithVACapTypeString(const std::string& type_string)
-{
-	LLAssetDictionary *dict = LLAssetDictionary::getInstance();
-    if (type_string=="none")
-    {
-        for (LLAssetDictionary::iterator iter = dict->begin();
-             iter != dict->end();
-             iter++)
-        {
-            AssetEntry *entry = iter->second;
-            entry->mFetchWithVACap = false;
-        } 
-    }
-    else if (type_string=="all")
-    {
-        for (LLAssetDictionary::iterator iter = dict->begin();
-             iter != dict->end();
-             iter++)
-        {
-            AssetEntry *entry = iter->second;
-            entry->mFetchWithVACap = true;
-        } 
-    }
-    else
-    {
-        for (LLAssetDictionary::iterator iter = dict->begin();
-             iter != dict->end();
-             iter++)
-        {
-            AssetEntry *entry = iter->second;
-            if (entry->mTypeName==type_string)
-            {
-                entry->mFetchWithVACap = true;
-            }
-        } 
-    }
-}
-
-// FIXME asset-http yank all this after asset-http becomes universal
-void LLAssetType::setFetchWithVACapConfigString(const std::string& config_string)
-{
-    // Clear any currently enabled types
-    LLAssetType::setFetchWithVACapTypeString("none");
-
-    // Enable all types specified in the config string.
-    std::set<std::string> type_names_for_va_cap;
-    boost::split(type_names_for_va_cap, config_string, boost::is_any_of(" :,"));
-    for (std::set<std::string>::const_iterator it = type_names_for_va_cap.begin();
-         it != type_names_for_va_cap.end(); ++it)
-    {
-        const std::string& type_string = *it;
-        LLAssetType::setFetchWithVACapTypeString(type_string);
-    }
-
-	LLAssetDictionary *dict = LLAssetDictionary::getInstance();
-	bool any_found = false;
-    for (LLAssetDictionary::iterator iter = dict->begin();
-         iter != dict->end();
-         iter++)
-    {
-        AssetEntry *entry = iter->second;
-        if (entry->mFetchWithVACap)
-        {
-            any_found = true;
-            LL_WARNS() << "Fetch with ViewerAsset cap enabled for " << entry->mTypeName << LL_ENDL;
-        }
-    } 
-	if (!any_found)
-	{
-		LL_WARNS() << "Fetch with ViewerAsset cap disabled for all types" << LL_ENDL;
-	}
-}
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index e06ebc2a35..b849be9f16 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -153,11 +153,6 @@ public:
 	static bool 				lookupIsAssetFetchByIDAllowed(EType asset_type); // the asset allows direct download
 	static bool 				lookupIsAssetIDKnowable(EType asset_type); // asset data can be known by the viewer
 
-	static bool 				lookupFetchWithVACap(EType asset_type); // asset data is fetched via http using ViewerAsset cap.
-
-    static void					setFetchWithVACapTypeString(const std::string& type_string);
-    static void					setFetchWithVACapConfigString(const std::string& config_string);
-	
 	static const std::string&	badLookup(); // error string when a lookup fails
 
 protected: