From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 1 Nov 2007 22:02:35 +0000 Subject: svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam. --- indra/newview/llviewertexteditor.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llviewertexteditor.h') diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index e05a61c3a3..1ec173a5d1 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -63,6 +63,7 @@ public: // mousehandler overrides virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); + virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask ); @@ -128,6 +129,8 @@ protected: LLUUID mNotecardInventoryID; LLPointer mInventoryCallback; + + LLViewHandle mPopupMenuHandle; }; #endif // LL_VIEWERTEXTEDITOR_H -- cgit v1.2.3