diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
| commit | 7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch) | |
| tree | 67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llinventoryobserver.h | |
| parent | 5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff) | |
| parent | 33e0766ee08cccb480675a75d83b3a6e78849906 (diff) | |
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llinventoryobserver.h')
| -rw-r--r-- | indra/newview/llinventoryobserver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h index 36d8ee3f59..4af8102055 100644 --- a/indra/newview/llinventoryobserver.h +++ b/indra/newview/llinventoryobserver.h @@ -28,7 +28,6 @@ #define LL_LLINVENTORYOBSERVERS_H #include "lluuid.h" -#include "llmd5.h" #include <string> #include <vector> @@ -271,14 +270,15 @@ public: void removeCategory(const LLUUID& cat_id); protected: + typedef LLUUID digest_t; // To clarify the actual usage of this "UUID" struct LLCategoryData { LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents); - LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, LLMD5 name_hash); + LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash); callback_t mCallback; S32 mVersion; S32 mDescendentsCount; - LLMD5 mItemNameHash; + digest_t mItemNameHash; bool mIsNameHashInitialized; LLUUID mCatID; }; |