diff options
author | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
commit | a408bac29378072fbf36864164149458c978cfcc (patch) | |
tree | 67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/llviewerassetstorage.h | |
parent | Second Life viewer sources 1.17.0.12 (diff) | |
download | meta-impy-a408bac29378072fbf36864164149458c978cfcc.zip meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2 meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz |
Second Life viewer sources 1.17.1.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerassetstorage.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerassetstorage.h b/linden/indra/newview/llviewerassetstorage.h index 8532e23..46840cb 100644 --- a/linden/indra/newview/llviewerassetstorage.h +++ b/linden/indra/newview/llviewerassetstorage.h | |||
@@ -52,7 +52,9 @@ public: | |||
52 | void* user_data, | 52 | void* user_data, |
53 | bool temp_file = false, | 53 | bool temp_file = false, |
54 | bool is_priority = false, | 54 | bool is_priority = false, |
55 | bool store_local = false); | 55 | bool store_local = false, |
56 | bool user_waiting=FALSE, | ||
57 | F64 timeout=LL_ASSET_STORAGE_TIMEOUT); | ||
56 | 58 | ||
57 | virtual void storeAssetData( | 59 | virtual void storeAssetData( |
58 | const char* filename, | 60 | const char* filename, |
@@ -61,7 +63,9 @@ public: | |||
61 | LLStoreAssetCallback callback, | 63 | LLStoreAssetCallback callback, |
62 | void* user_data, | 64 | void* user_data, |
63 | bool temp_file = false, | 65 | bool temp_file = false, |
64 | bool is_priority = false); | 66 | bool is_priority = false, |
67 | bool user_waiting=FALSE, | ||
68 | F64 timeout=LL_ASSET_STORAGE_TIMEOUT); | ||
65 | }; | 69 | }; |
66 | 70 | ||
67 | #endif | 71 | #endif |