diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-04-03 17:22:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 15:22:40 -0700 |
| commit | 7c831d115b55b96129806353a51a01dcf2bcebba (patch) | |
| tree | 03d2a767ff5c4ce0200dbe5e44fa431cd0ed399c /indra/newview/llvocache.h | |
| parent | 982281b6cbba2db8757c906d1c8d5053f1c6696b (diff) | |
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147)
Diffstat (limited to 'indra/newview/llvocache.h')
| -rw-r--r-- | indra/newview/llvocache.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index dcc8d37c5c..ec0df31828 100644 --- a/indra/newview/llvocache.h +++ b/indra/newview/llvocache.h @@ -32,6 +32,7 @@ #include "lldir.h" #include "llvieweroctree.h" #include "llapr.h" +#include "llgltfmaterial.h" #include <unordered_map> @@ -46,9 +47,10 @@ public: LLSD toLLSD() const; LLUUID mObjectId; - std::map<S32, std::string> mSides; //json per side - U64 mRegionHandle; - bool mHasRegionHandle; + U32 mLocalId = 0; + std::unordered_map<S32, std::string> mSides; //json per side + std::unordered_map<S32, LLPointer<LLGLTFMaterial> > mGLTFMaterial; //GLTF material per side + U64 mRegionHandle = 0; }; class LLVOCacheEntry |