diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:42:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:42:12 +0100 |
| commit | 476f5e064ea327b1e3426ba2efb5971ced8ba9b0 (patch) | |
| tree | 961a61ff2a369fa719f6c4a622fdd347165b5320 /indra/newview/llinventoryobserver.h | |
| parent | ac787b54682cef5d11ff13fba46024030e7b1edb (diff) | |
| parent | eef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (diff) | |
(hairy) merge from viewer-release
Diffstat (limited to 'indra/newview/llinventoryobserver.h')
| -rw-r--r-- | indra/newview/llinventoryobserver.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h index ccd5fa5f4e..d535250970 100644 --- a/indra/newview/llinventoryobserver.h +++ b/indra/newview/llinventoryobserver.h @@ -295,18 +295,14 @@ public: protected: struct LLCategoryData { - LLCategoryData(callback_t cb, S32 version, S32 num_descendents) - : mCallback(cb) - , mVersion(version) - , mDescendentsCount(num_descendents) - { - mItemNameHash.finalize(); - } + LLCategoryData(const LLUUID& cat_id, callback_t cb, S32 version, S32 num_descendents); callback_t mCallback; S32 mVersion; S32 mDescendentsCount; LLMD5 mItemNameHash; + bool mIsNameHashInitialized; + LLUUID mCatID; }; typedef std::map<LLUUID, LLCategoryData> category_map_t; |