Remove redundant LL_EXSTAT_ from enums.

1 files changed, 12 insertions, 15 deletions

diff --git a/indra/llmessage/llextendedstatus.h b/indra/llmessage/llextendedstatus.h
index 8bb8165419..9923d73c1a 100644
--- a/indra/llmessage/llextendedstatus.h
+++ b/indra/llmessage/llextendedstatus.h
@@ -32,34 +32,31 @@ enum class LLExtStat: uint32_t
 {
 	// Status provider groups - Top bits indicate which status type it is
 	// Zero is common status code (next section)
-	LL_EXSTAT_CURL_RESULT	= 1UL<<30, // serviced by curl - use 1L if we really implement the below
-	LL_EXSTAT_RES_RESULT	= 2UL<<30, // serviced by resident copy
-	LL_EXSTAT_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
+	VFS_RESULT	= 3UL<<30, // serviced by vfs
 
 
 	// Common Status Codes
 	//
-	LL_EXSTAT_NONE				= 0x00000, // No extra info here - sorry!
-	LL_EXSTAT_NULL_UUID			= 0x10001, // null asset ID
-	LL_EXSTAT_NO_UPSTREAM		= 0x10002, // attempt to upload without a valid upstream method/provider
-	LL_EXSTAT_REQUEST_DROPPED	= 0x10003, // request was dropped unserviced
-	LL_EXSTAT_NONEXISTENT_FILE	= 0x10004, // trying to upload a file that doesn't exist
-	LL_EXSTAT_BLOCKED_FILE		= 0x10005, // trying to upload a file that we can't open
-
+	NONE			= 0x00000, // No extra info here - sorry!
+	NULL_UUID		= 0x10001, // null asset ID
+	NO_UPSTREAM		= 0x10002, // attempt to upload without a valid upstream method/provider
+	REQUEST_DROPPED	= 0x10003, // request was dropped unserviced
+	NONEXISTENT_FILE= 0x10004, // trying to upload a file that doesn't exist
+	BLOCKED_FILE	= 0x10005, // trying to upload a file that we can't open
 
 	// curl status codes:
 	//
-	// Mask off LL_EXSTAT_CURL_RESULT for original result and
+	// Mask off CURL_RESULT for original result and
 	// see: libraries/include/curl/curl.h
 
-
 	// Memory-Resident status codes:
 	// None at present
 
-
 	// VFS status codes:
-	LL_EXSTAT_VFS_CACHED	= LL_EXSTAT_VFS_RESULT | 0x0001,
-	LL_EXSTAT_VFS_CORRUPT	= LL_EXSTAT_VFS_RESULT | 0x0002,
+	VFS_CACHED	= VFS_RESULT | 0x0001,
+	VFS_CORRUPT	= VFS_RESULT | 0x0002,
 };