summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
diff options
context:
space:
mode:
authorGraham Linden <none@none>2014-07-31 08:40:57 -0700
committerGraham Linden <none@none>2014-07-31 08:40:57 -0700
commitdb43a0560c259623a1a8022668f8482d82cae9c8 (patch)
tree31e532720212ed1697897d6c2694fe991cb8f812 /indra/llui/lltexteditor.h
parent76e7f978c157f9921593ea0e43f642cb9de4703d (diff)
parent532433674c9553636af9ea8d433b9da6d6fae587 (diff)
Merge viewer-release
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rwxr-xr-xindra/llui/lltexteditor.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 2408613824..f6bdf917b4 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -282,6 +282,7 @@ protected:
bool mParseOnTheFly;
void updateLinkSegments();
+ void keepSelectionOnReturn(bool keep) { mKeepSelectionOnReturn = keep; }
class LLViewBorder* mBorder;
private:
@@ -316,6 +317,7 @@ private:
bool mShowContextMenu;
bool mEnableTooltipPaste;
bool mPassDelete;
+ bool mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter
LLUUID mSourceID;