diff options
Diffstat (limited to 'linden/indra/llmessage/llassetstorage.cpp')
-rw-r--r-- | linden/indra/llmessage/llassetstorage.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp index c8610a7..8696438 100644 --- a/linden/indra/llmessage/llassetstorage.cpp +++ b/linden/indra/llmessage/llassetstorage.cpp | |||
@@ -162,6 +162,8 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type | |||
162 | mHost(), | 162 | mHost(), |
163 | mIsTemp( FALSE ), | 163 | mIsTemp( FALSE ), |
164 | mIsLocal(FALSE), | 164 | mIsLocal(FALSE), |
165 | mIsUserWaiting(FALSE), | ||
166 | mTimeout(LL_ASSET_STORAGE_TIMEOUT), | ||
165 | mIsPriority(FALSE), | 167 | mIsPriority(FALSE), |
166 | mDataSentInFirstPacket(FALSE), | 168 | mDataSentInFirstPacket(FALSE), |
167 | mDataIsInVFS( FALSE ) | 169 | mDataIsInVFS( FALSE ) |
@@ -1270,7 +1272,9 @@ void LLAssetStorage::storeAssetData( | |||
1270 | void* user_data, | 1272 | void* user_data, |
1271 | bool temp_file, | 1273 | bool temp_file, |
1272 | bool is_priority, | 1274 | bool is_priority, |
1273 | bool store_local) | 1275 | bool store_local, |
1276 | bool user_waiting, | ||
1277 | F64 timeout) | ||
1274 | { | 1278 | { |
1275 | llwarns << "storeAssetData: wrong version called" << llendl; | 1279 | llwarns << "storeAssetData: wrong version called" << llendl; |
1276 | } | 1280 | } |
@@ -1285,7 +1289,9 @@ void LLAssetStorage::storeAssetData( | |||
1285 | bool temp_file , | 1289 | bool temp_file , |
1286 | bool is_priority, | 1290 | bool is_priority, |
1287 | bool store_local, | 1291 | bool store_local, |
1288 | const LLUUID& requesting_agent_id) | 1292 | const LLUUID& requesting_agent_id, |
1293 | bool user_waiting, | ||
1294 | F64 timeout) | ||
1289 | { | 1295 | { |
1290 | llwarns << "storeAssetData: wrong version called" << llendl; | 1296 | llwarns << "storeAssetData: wrong version called" << llendl; |
1291 | } | 1297 | } |
@@ -1299,7 +1305,9 @@ void LLAssetStorage::storeAssetData( | |||
1299 | LLStoreAssetCallback callback, | 1305 | LLStoreAssetCallback callback, |
1300 | void* user_data, | 1306 | void* user_data, |
1301 | bool temp_file, | 1307 | bool temp_file, |
1302 | bool is_priority) | 1308 | bool is_priority, |
1309 | bool user_waiting, | ||
1310 | F64 timeout) | ||
1303 | { | 1311 | { |
1304 | llwarns << "storeAssetData: wrong version called" << llendl; | 1312 | llwarns << "storeAssetData: wrong version called" << llendl; |
1305 | } | 1313 | } |
@@ -1313,7 +1321,9 @@ void LLAssetStorage::storeAssetData( | |||
1313 | LLStoreAssetCallback callback, | 1321 | LLStoreAssetCallback callback, |
1314 | void* user_data, | 1322 | void* user_data, |
1315 | bool temp_file, | 1323 | bool temp_file, |
1316 | bool is_priority) | 1324 | bool is_priority, |
1325 | bool user_waiting, | ||
1326 | F64 timeout) | ||
1317 | { | 1327 | { |
1318 | llwarns << "storeAssetData: wrong version called" << llendl; | 1328 | llwarns << "storeAssetData: wrong version called" << llendl; |
1319 | } | 1329 | } |