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/llassetstorage.cpp | |
| 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/llassetstorage.cpp')
| -rw-r--r-- | indra/llmessage/llassetstorage.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index b05636a45c..2f489608e7 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -143,6 +143,8 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type mIsTemp( FALSE ), mIsLocal(FALSE), mIsPriority(FALSE), + mIsUserWaiting(FALSE), + mTimeout(LL_ASSET_STORAGE_TIMEOUT), mDataSentInFirstPacket(FALSE), mDataIsInVFS( FALSE ) { @@ -1250,7 +1252,9 @@ void LLAssetStorage::storeAssetData( void* user_data, bool temp_file, bool is_priority, - bool store_local) + bool store_local, + bool user_waiting, + F64 timeout) { llwarns << "storeAssetData: wrong version called" << llendl; } @@ -1265,7 +1269,9 @@ void LLAssetStorage::storeAssetData( bool temp_file , bool is_priority, bool store_local, - const LLUUID& requesting_agent_id) + const LLUUID& requesting_agent_id, + bool user_waiting, + F64 timeout) { llwarns << "storeAssetData: wrong version called" << llendl; } @@ -1279,7 +1285,9 @@ void LLAssetStorage::storeAssetData( LLStoreAssetCallback callback, void* user_data, bool temp_file, - bool is_priority) + bool is_priority, + bool user_waiting, + F64 timeout) { llwarns << "storeAssetData: wrong version called" << llendl; } @@ -1293,7 +1301,9 @@ void LLAssetStorage::storeAssetData( LLStoreAssetCallback callback, void* user_data, bool temp_file, - bool is_priority) + bool is_priority, + bool user_waiting, + F64 timeout) { llwarns << "storeAssetData: wrong version called" << llendl; } |