diff options
| author | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2022-11-29 21:42:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-29 21:42:43 +0200 |
| commit | 78feca373ea35bfac5ae63095e354257e0d1a1ec (patch) | |
| tree | f45c52534eaeed15fc9e2c8e80ae1a4c33d93ceb /indra/newview/llvovolume.h | |
| parent | adbd264d35f5fabe28249839da6c12e5dac4127f (diff) | |
SL-12069 Backed out changeset: 544a91982eba (#13)
Originally a fix for MAINT-4773/SL-5842 (transparent alpha being white). Reverting due to a critical flaw of the fix replacing material (sometimes server side included). And ignoring user and script input in some cases that makes scripts misbehave.
Viewer should Not modify existing content of own volition.
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 |