diff options
| author | James Cook <james@lindenlab.com> | 2009-10-27 12:07:02 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-27 12:07:02 -0700 |
| commit | b93c4d6bd69b7ddb7348cd54b2f88c4150f9e852 (patch) | |
| tree | 12b91fb51feb977e69d2cdfecf09ccdfc8d52615 /indra/llui/lltexteditor.h | |
| parent | a1981aeec5653109d7399b87c8c8bc4162b2762c (diff) | |
| parent | b403745bfe8750255dbcf9a3640ac111aa38f2f2 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltexteditor.h')
| -rw-r--r-- | indra/llui/lltexteditor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 481a4d1a78..4847f4d117 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -99,6 +99,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 ); virtual BOOL handleMiddleMouseDown(S32 x,S32 y,MASK mask); @@ -201,6 +202,7 @@ public: void getSelectedSegments(segment_vec_t& segments) const; protected: + void showContextMenu(S32 x, S32 y); void drawPreeditMarker(); void assignEmbedded(const std::string &s); @@ -328,6 +330,8 @@ private: LLCoordGL mLastIMEPosition; // Last position of the IME editor keystroke_signal_t mKeystrokeSignal; + + LLContextMenu* mContextMenu; }; // end class LLTextEditor |