summaryrefslogtreecommitdiff
path: root/indra/llmessage/llextendedstatus.h
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-03-02 22:04:37 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-03-02 22:04:37 +0000
commit9fdd1582774a928242b7fec91bbd951b123296e8 (patch)
tree600cd078a00e80a33504c748540e333a34a4b30d /indra/llmessage/llextendedstatus.h
parent31bca613a6011f5e1a95cffafd283e445142557f (diff)
parent363bc9d9d0fe4f42b0dfbdb7adeb9a481a4fe55b (diff)
Merged in DV525-merge-6.4.15 (pull request #483)
DRTVWR-525 merge up to 6.4.15
Diffstat (limited to 'indra/llmessage/llextendedstatus.h')
-rw-r--r--indra/llmessage/llextendedstatus.h14
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,
};