diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:19 +0300 |
| commit | 789be6b93351e6150e5c2167a1ae3a64eed0717c (patch) | |
| tree | a302168e5b155cfb54ad70d4bfb55c9c4dcd008e /indra/newview/llvovolume.h | |
| parent | 487685fef1ad4afdb1d6692a4ab6b2980205abd7 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
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 ce400a3498..97888ed869 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -441,26 +441,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 |