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/llface.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/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index ee545acb94..2d88c6fa58 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -230,13 +230,10 @@ public: static U32 getRiggedDataMask(U32 type); - void notifyAboutCreatingTexture(LLViewerTexture *texture); - void notifyAboutMissingAsset(LLViewerTexture *texture); - public: //aligned members LLVector4a mExtents[2]; -private: +private: F32 adjustPartialOverlapPixelArea(F32 cos_angle_to_view_dir, F32 radius ); BOOL calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ; public: |