diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
commit | 18e96f5264fcdf56e2c6b2a67e1e63a8506a242f (patch) | |
tree | 67abe5d534cd0ff6dc8c6ee06c5d6c102619d381 /indra/newview/llmediactrl.h | |
parent | 20be54210f17db8499a234760b0eef91fb962731 (diff) | |
parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) |
Merge branch 'main' into DRTVWR-579-texture-preview
Diffstat (limited to 'indra/newview/llmediactrl.h')
-rw-r--r-- | indra/newview/llmediactrl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index bc4cbaae68..487c654adc 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -174,8 +174,6 @@ public: LLUUID getTextureID() {return mMediaTextureID;} - void updateContextMenuParent(LLView* pNewParent); - // The Browser windows want keyup and keydown events. Overridden from LLFocusableElement to return true. virtual bool wantsKeyUpKeyDown() const; virtual bool wantsReturnKey() const; @@ -220,7 +218,7 @@ public: mTextureHeight; class LLWindowShade* mWindowShade; - LLContextMenu* mContextMenu; + LLHandle<LLContextMenu> mContextMenuHandle; }; #endif // LL_LLMediaCtrl_H |