diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
| commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
| tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/llui/lltexteditor.h | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Pull merge from lindenlab/viewer-developement
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 5e189070fa..969e072704 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -65,6 +65,7 @@ public: show_line_numbers, commit_on_focus_lost, show_context_menu, + enable_tooltip_paste, auto_indent; //colors @@ -297,6 +298,8 @@ private: // Methods // void pasteHelper(bool is_primary); + void cleanStringForPaste(LLWString & clean_string); + void pasteTextWithLinebreaks(LLWString & clean_string); void drawLineNumbers(); @@ -330,6 +333,7 @@ private: BOOL mAllowEmbeddedItems; bool mShowContextMenu; bool mParseOnTheFly; + bool mEnableTooltipPaste; bool mPassDelete; LLUUID mSourceID; |