diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-22 18:23:39 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-22 18:23:39 +0000 |
| commit | 55c92418ef3114a58825af65f4fe531d0c4b0502 (patch) | |
| tree | 34353e0868d6ff72bb219cea67423b72402c75cf /indra/llmessage/llhttpassetstorage.h | |
| parent | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (diff) | |
svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release
NOTE: Skipped whitespace-only changes
Diffstat (limited to 'indra/llmessage/llhttpassetstorage.h')
| -rw-r--r-- | indra/llmessage/llhttpassetstorage.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpassetstorage.h b/indra/llmessage/llhttpassetstorage.h index a9cd88d629..d6f74d7744 100644 --- a/indra/llmessage/llhttpassetstorage.h +++ b/indra/llmessage/llhttpassetstorage.h @@ -46,7 +46,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, @@ -55,7 +57,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, |