diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
| commit | 99b99a1b4a21758ef888b251d8f8bbf565f8b42e (patch) | |
| tree | 5c91eaa4a6dffd724cdb0cb8f4de8c11f82335a5 /indra/newview/llvovolume.h | |
| parent | 0df59ff9e6e50237d36a976731e81c6e37e73933 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Clean up a merge conflict
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 73eeec813c..768af59747 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -440,26 +440,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 |