summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmessage/llassetstorage.cpp')
-rw-r--r--indra/llmessage/llassetstorage.cpp18
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;
}