diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-11-10 20:33:51 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-11-10 20:33:51 +0200 |
| commit | 83b0467f9f16387dc8e13ba7e4bf4f556512ddf3 (patch) | |
| tree | b7501c3775679cc0f67760897574592406c5d0ce /indra/newview/llvovolume.h | |
| parent | 9d962be2a825bfbd47fcd0c200508c552c8aff78 (diff) | |
Backed out changeset: 544a91982eba
Originally a fix for MAINT-4773. This was causing a number of issues since
changes made in this code were pushing null textures into server and viewer
should not modify 'content' at server of own violition.
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index a331908320..b07d416363 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -380,7 +380,7 @@ public: static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop static F32 sLODFactor; // LOD scale factor static F32 sDistanceFactor; // LOD distance factor - + static LLPointer<LLObjectMediaDataClient> sObjectMediaClient; static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient; @@ -388,26 +388,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 |