diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-05 12:25:18 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-05 12:25:18 +0200 |
| commit | 553cf40d136e70f4819cb2b72d0483287db81b17 (patch) | |
| tree | ca7eab61f1ae10840fbd6664e023f08b0ee5115f /indra/llui/lltexteditor.h | |
| parent | 20e9e6b57e52973ccb12b45da05e69bcaa88d736 (diff) | |
Updated low bug EXT-4951 - Redundant edit box context menu in list items in Panel Picks/Classifieds.
Reverted changeset 8956:930bef051fee.
Added new parameter to control context menu visibility.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltexteditor.h')
| -rw-r--r-- | indra/llui/lltexteditor.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index a136f9ccce..d96198d9ce 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -68,7 +68,8 @@ public: ignore_tab, handle_edit_keys_directly, show_line_numbers, - commit_on_focus_lost; + commit_on_focus_lost, + show_context_menu; //colors Optional<LLUIColor> default_color; @@ -200,6 +201,9 @@ public: const LLTextSegmentPtr getPreviousSegment() const; void getSelectedSegments(segment_vec_t& segments) const; + void setShowContextMenu(bool show) { mShowContextMenu = show; } + bool getChowContextMenu() const { return mShowContextMenu; } + protected: void showContextMenu(S32 x, S32 y); void drawPreeditMarker(); @@ -319,6 +323,7 @@ private: BOOL mTakesFocus; BOOL mAllowEmbeddedItems; + bool mShowContextMenu; LLUUID mSourceID; |