Second Life viewer sources 1.17.1.0

1 files changed, 6 insertions, 2 deletions

diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 2977301..962bece 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -66,7 +66,9 @@ public:
                 bool temp_file = false,
                 bool is_priority = false,
                 bool store_local = false,
-                const LLUUID& requesting_agent_id = LLUUID::null);
+                const LLUUID& requesting_agent_id = LLUUID::null,
+                bool user_waiting=FALSE,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual void storeAssetData(
                 const char* filename,
@@ -75,7 +77,9 @@ public:
                 LLStoreAssetCallback callback,
                 void* user_data,
                 bool temp_file,
-                bool is_priority);
+                bool is_priority,
+                bool user_waiting=FALSE,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual LLSD getPendingDetails(ERequestType rt,
                                         LLAssetType::EType asset_type,