diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-03-02 22:41:49 +0000 |
commit | a0b9fd6eb0dacfec30df0caac8dbbd7c25366c72 (patch) | |
tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/llmessage/llextendedstatus.h | |
parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
parent | 10241c5596402a145e4087c36014d84507183c32 (diff) |
Merged in DV528-merge-6.4.15 (pull request #484)
DRTVWR-528 merge up to 6.4.15
Diffstat (limited to 'indra/llmessage/llextendedstatus.h')
-rw-r--r-- | indra/llmessage/llextendedstatus.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llmessage/llextendedstatus.h b/indra/llmessage/llextendedstatus.h index 9923d73c1a..2a53dced80 100644 --- a/indra/llmessage/llextendedstatus.h +++ b/indra/llmessage/llextendedstatus.h @@ -1,7 +1,7 @@ /** * @file llextendedstatus.h * @date August 2007 - * @brief extended status codes for curl/vfs/resident asset storage and delivery + * @brief extended status codes for curl/resident asset storage and delivery * * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * Second Life Viewer Source Code @@ -32,9 +32,9 @@ enum class LLExtStat: uint32_t { // Status provider groups - Top bits indicate which status type it is // Zero is common status code (next section) - CURL_RESULT = 1UL<<30, // serviced by curl - use 1L if we really implement the below - RES_RESULT = 2UL<<30, // serviced by resident copy - VFS_RESULT = 3UL<<30, // serviced by vfs + CURL_RESULT = 1UL<<30, // serviced by curl - use 1L if we really implement the below + RES_RESULT = 2UL<<30, // serviced by resident copy + CACHE_RESULT = 3UL<<30, // serviced by cache // Common Status Codes @@ -54,9 +54,9 @@ enum class LLExtStat: uint32_t // Memory-Resident status codes: // None at present - // VFS status codes: - VFS_CACHED = VFS_RESULT | 0x0001, - VFS_CORRUPT = VFS_RESULT | 0x0002, + // CACHE status codes: + CACHE_CACHED = CACHE_RESULT | 0x0001, + CACHE_CORRUPT = CACHE_RESULT | 0x0002, }; |