Second Life viewer sources 1.15.1.3

1 files changed, 4 insertions, 7 deletions

diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index 3c7a709..f80a77d 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -48,6 +48,10 @@ class LLAssetStorage;
 class LLVFS;
 class LLSD;
 
+// anything that takes longer than this to download will abort.
+// HTTP Uploads also timeout if they take longer than this.
+const F32 LL_ASSET_STORAGE_TIMEOUT = 5 * 60.0f;  
+
 class LLAssetInfo
 {
 protected:
@@ -264,13 +268,6 @@ public:
                 bool store_local = false,
                 const LLUUID& requesting_agent_id = LLUUID::null);
 
-        // This call will attempt to clear a store asset. This will only
-        // attempt to cancel an upload that has not yet begun. The
-        // callback will be called with an error code.
-        virtual void cancelStoreAsset(
-                const LLUUID& uuid,
-                LLAssetType::EType oatype); 
-
         virtual void checkForTimeouts();
 
         void getEstateAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,