diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
| commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
| tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/newview/llvovolume.h | |
| parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge with tip of Master after Viewer release
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 768af59747..73eeec813c 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -440,6 +440,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 |