diff options
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index c3719d0918..19eb26e809 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -1,25 +1,25 @@ -/** +/** * @file llviewerassetstorage.h * @brief Class for loading asset data to/from an external source. * * $LicenseInfo:firstyear=2003&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -37,41 +37,41 @@ class LLViewerAssetRequest; class LLViewerAssetStorage : public LLAssetStorage { public: - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host); - - LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer); - - ~LLViewerAssetStorage(); - - void storeAssetData( - const LLTransactionID& tid, - LLAssetType::EType atype, - LLStoreAssetCallback callback, - void* user_data, - bool temp_file = false, - bool is_priority = false, - bool store_local = false, - bool user_waiting=FALSE, - F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override; - - void storeAssetData( - const std::string& filename, - const LLTransactionID& tid, - LLAssetType::EType type, - LLStoreAssetCallback callback, - void* user_data, - bool temp_file = false, - bool is_priority = false, - bool user_waiting=FALSE, - F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override; + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host); + + LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer); + + ~LLViewerAssetStorage(); + + void storeAssetData( + const LLTransactionID& tid, + LLAssetType::EType atype, + LLStoreAssetCallback callback, + void* user_data, + bool temp_file = false, + bool is_priority = false, + bool store_local = false, + bool user_waiting=FALSE, + F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override; + + void storeAssetData( + const std::string& filename, + const LLTransactionID& tid, + LLAssetType::EType type, + LLStoreAssetCallback callback, + void* user_data, + bool temp_file = false, + bool is_priority = false, + bool user_waiting=FALSE, + F64Seconds timeout=LL_ASSET_STORAGE_TIMEOUT) override; protected: - void _queueDataRequest(const LLUUID& uuid, - LLAssetType::EType type, + void _queueDataRequest(const LLUUID& uuid, + LLAssetType::EType type, LLGetAssetCallback callback, - void *user_data, - BOOL duplicate, - BOOL is_priority) override; + void *user_data, + BOOL duplicate, + BOOL is_priority) override; void queueRequestHttp(const LLUUID& uuid, LLAssetType::EType type, @@ -81,7 +81,7 @@ protected: BOOL is_priority); void capsRecvForRegion(const LLUUID& region_id, std::string pumpname); - + void assetRequestCoro(LLViewerAssetRequest *req, const LLUUID uuid, LLAssetType::EType atype, |