diff options
| author | Runitai Linden <davep@lindenlab.com> | 2020-03-06 09:11:44 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2020-03-06 09:11:44 -0600 |
| commit | ecf8c6f520b02077d5ec575bae83022f59bf73e5 (patch) | |
| tree | 677e95f130a80084815f1dd0ccbda1ad0638397b /indra/newview/llface.h | |
| parent | 7c7d71269f5b47397d14bbe44e341e4ac1d96889 (diff) | |
| parent | c1a3797b304f95e4ed025596d611bb2861d322b8 (diff) | |
Merge branch 'DRTVWR-440' of bitbucket.org:lindenlab/viewer into davep/BUG-228263
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 0c5af5b579..c74d4e3fa8 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -218,6 +218,9 @@ public: void setHasMedia(bool has_media) { mHasMedia = has_media ;} BOOL hasMedia() const ; + void setMediaAllowed(bool is_media_allowed) { mIsMediaAllowed = is_media_allowed; } + BOOL isMediaAllowed() const { return mIsMediaAllowed; } + BOOL switchTexture() ; //vertex buffer tracking @@ -293,6 +296,7 @@ private: F32 mImportanceToCamera ; F32 mBoundingSphereRadius ; bool mHasMedia ; + bool mIsMediaAllowed; protected: |