diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-24 14:44:48 -0400 |
| commit | 6daa52b3b93328506e34d6595a01d30c334897bc (patch) | |
| tree | bdbe951d06f95a1a7752d5c23950eda7bb36a9e7 /indra/llui/lltexteditor.cpp | |
| parent | 850bdf4ce335049a75e1c4f6400b627bf328a264 (diff) | |
| parent | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (diff) | |
Merge branch 'develop' into maxim/viewer_2245
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 088fbe2744..81959f1542 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -1602,8 +1602,14 @@ void LLTextEditor::cleanStringForPaste(LLWString & clean_string) } } -void LLTextEditor::pasteTextWithLinebreaksImpl(const LLWString & clean_string) +void LLTextEditor::pasteTextWithLinebreaksImpl(const LLWString & clean_string, bool reset_cursor) { + if (reset_cursor) + { + deselect(); + setCursorPos(getLength()); + } + std::basic_string<llwchar>::size_type start = 0; std::basic_string<llwchar>::size_type pos = clean_string.find('\n',start); |