diff options
Diffstat (limited to 'linden/indra/llmessage/llassetstorage.cpp')
-rw-r--r-- | linden/indra/llmessage/llassetstorage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp index 16a96b7..0ab1081 100644 --- a/linden/indra/llmessage/llassetstorage.cpp +++ b/linden/indra/llmessage/llassetstorage.cpp | |||
@@ -1028,12 +1028,12 @@ LLSD LLAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt, | |||
1028 | { | 1028 | { |
1029 | const request_list_t* requests = getRequestList(rt); | 1029 | const request_list_t* requests = getRequestList(rt); |
1030 | LLSD sd; | 1030 | LLSD sd; |
1031 | sd["requests"] = getPendingDetails(requests, asset_type, detail_prefix); | 1031 | sd["requests"] = getPendingDetailsImpl(requests, asset_type, detail_prefix); |
1032 | return sd; | 1032 | return sd; |
1033 | } | 1033 | } |
1034 | 1034 | ||
1035 | // virtual | 1035 | // virtual |
1036 | LLSD LLAssetStorage::getPendingDetails(const LLAssetStorage::request_list_t* requests, | 1036 | LLSD LLAssetStorage::getPendingDetailsImpl(const LLAssetStorage::request_list_t* requests, |
1037 | LLAssetType::EType asset_type, | 1037 | LLAssetType::EType asset_type, |
1038 | const std::string& detail_prefix) const | 1038 | const std::string& detail_prefix) const |
1039 | { | 1039 | { |
@@ -1116,11 +1116,11 @@ LLSD LLAssetStorage::getPendingRequest(LLAssetStorage::ERequestType rt, | |||
1116 | const LLUUID& asset_id) const | 1116 | const LLUUID& asset_id) const |
1117 | { | 1117 | { |
1118 | const request_list_t* requests = getRequestList(rt); | 1118 | const request_list_t* requests = getRequestList(rt); |
1119 | return getPendingRequest(requests, asset_type, asset_id); | 1119 | return getPendingRequestImpl(requests, asset_type, asset_id); |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | // virtual | 1122 | // virtual |
1123 | LLSD LLAssetStorage::getPendingRequest(const LLAssetStorage::request_list_t* requests, | 1123 | LLSD LLAssetStorage::getPendingRequestImpl(const LLAssetStorage::request_list_t* requests, |
1124 | LLAssetType::EType asset_type, | 1124 | LLAssetType::EType asset_type, |
1125 | const LLUUID& asset_id) const | 1125 | const LLUUID& asset_id) const |
1126 | { | 1126 | { |
@@ -1139,7 +1139,7 @@ bool LLAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt, | |||
1139 | const LLUUID& asset_id) | 1139 | const LLUUID& asset_id) |
1140 | { | 1140 | { |
1141 | request_list_t* requests = getRequestList(rt); | 1141 | request_list_t* requests = getRequestList(rt); |
1142 | if (deletePendingRequest(requests, asset_type, asset_id)) | 1142 | if (deletePendingRequestImpl(requests, asset_type, asset_id)) |
1143 | { | 1143 | { |
1144 | llinfos << "Asset " << getRequestName(rt) << " request for " | 1144 | llinfos << "Asset " << getRequestName(rt) << " request for " |
1145 | << asset_id << "." << LLAssetType::lookup(asset_type) | 1145 | << asset_id << "." << LLAssetType::lookup(asset_type) |
@@ -1150,7 +1150,7 @@ bool LLAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt, | |||
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | // virtual | 1152 | // virtual |
1153 | bool LLAssetStorage::deletePendingRequest(LLAssetStorage::request_list_t* requests, | 1153 | bool LLAssetStorage::deletePendingRequestImpl(LLAssetStorage::request_list_t* requests, |
1154 | LLAssetType::EType asset_type, | 1154 | LLAssetType::EType asset_type, |
1155 | const LLUUID& asset_id) | 1155 | const LLUUID& asset_id) |
1156 | { | 1156 | { |