diff options
| author | Signal Linden <signal@lindenlab.com> | 2023-04-10 10:54:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-10 10:54:13 -0700 |
| commit | 53d4e69c514374622afb93f81067aaeec64a443b (patch) | |
| tree | a327a68d2f1f351275539d65fc7237cbdc29c577 /indra/newview/llmediactrl.h | |
| parent | 4042ed9701fcfa42c03fc285a757aa348f800e33 (diff) | |
| parent | ff0edab69a1dc4884b7636c2546327901ce8fdde (diff) | |
Merge pull request #159 from secondlife/marchcat/main-contrib-merge
merge main into contribute
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 |