diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-05-26 10:57:39 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-05-26 10:57:39 -0600 |
| commit | 7199ce45142f47003ba04381a76c1a4c7545f127 (patch) | |
| tree | ea062b13c8e53ca8d040d6377d0e40d28070c654 /indra/newview/llvovolume.h | |
| parent | 272da688f75880f73e227ae62bad1c5a9b28b288 (diff) | |
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef876a7e6fb6861441f14e5e7f0c7735.
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 97888ed869..ce400a3498 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -441,6 +441,26 @@ protected: static S32 sNumLODChanges; friend class LLVolumeImplFlexible; + +public: + bool notifyAboutCreatingTexture(LLViewerTexture *texture); + bool notifyAboutMissingAsset(LLViewerTexture *texture); + +private: + struct material_info + { + LLRender::eTexIndex map; + U8 te; + + material_info(LLRender::eTexIndex map_, U8 te_) + : map(map_) + , te(te_) + {} + }; + + typedef std::multimap<LLUUID, material_info> mmap_UUID_MAP_t; + mmap_UUID_MAP_t mWaitingTextureInfo; + }; #endif // LL_LLVOVOLUME_H |