diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-06-07 15:35:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-06-07 15:35:17 -0600 |
| commit | 9dc6a6a1b7ec21a578ac6f5a92eb16037f323824 (patch) | |
| tree | 3778170a54540aeda742494df8d18b8383e11f23 /indra/newview/llvovolume.h | |
| parent | 639acb6ff7495a6840d437dd8473172ec03e200a (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DV528-merge-6.4.20
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 |