diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-30 09:29:48 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-30 09:29:48 -0800 |
| commit | 0d58d3ee7a4196f31d45dd5a466a452d887a6968 (patch) | |
| tree | 244d5e5b1eb39f3ac43a43e6e1bf052192791764 /indra/newview/llvovolume.h | |
| parent | e9db970b677719d85c0ca28d1577ee3f7b995801 (diff) | |
| parent | c99c24939a18b5aa6c29af189a1d91f254c8b5a2 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 003ab38d64..2c269d745d 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -476,26 +476,6 @@ 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 |