diff options
Diffstat (limited to 'linden/indra/newview/llviewerassetstorage.cpp')
-rw-r--r-- | linden/indra/newview/llviewerassetstorage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp index 95ef983..d9a5ada 100644 --- a/linden/indra/newview/llviewerassetstorage.cpp +++ b/linden/indra/newview/llviewerassetstorage.cpp | |||
@@ -57,7 +57,9 @@ void LLViewerAssetStorage::storeAssetData( | |||
57 | void* user_data, | 57 | void* user_data, |
58 | bool temp_file, | 58 | bool temp_file, |
59 | bool is_priority, | 59 | bool is_priority, |
60 | bool store_local) | 60 | bool store_local, |
61 | bool user_waiting, | ||
62 | F64 timeout) | ||
61 | { | 63 | { |
62 | LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID()); | 64 | LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID()); |
63 | llinfos << "LLViewerAssetStorage::storeAssetData (legacy) " << tid << ":" << LLAssetType::lookup(asset_type) | 65 | llinfos << "LLViewerAssetStorage::storeAssetData (legacy) " << tid << ":" << LLAssetType::lookup(asset_type) |
@@ -161,7 +163,9 @@ void LLViewerAssetStorage::storeAssetData( | |||
161 | LLStoreAssetCallback callback, | 163 | LLStoreAssetCallback callback, |
162 | void* user_data, | 164 | void* user_data, |
163 | bool temp_file, | 165 | bool temp_file, |
164 | bool is_priority) | 166 | bool is_priority, |
167 | bool user_waiting, | ||
168 | F64 timeout) | ||
165 | { | 169 | { |
166 | if(!filename) | 170 | if(!filename) |
167 | { | 171 | { |