diff options
author | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
commit | 030d61ac58be38f9f8aafeb68b383d88d670080b (patch) | |
tree | 79af0678906bf9e05316614d52b4cf5e97d1adc2 /indra/llui/lllineeditor.h | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
parent | d031662435d97101411ae990ed85d6e001ab668a (diff) |
Merged in D559-merge-6.5.5 (pull request #946)
DRTVWR-559 merge up to 6.5.5
Diffstat (limited to 'indra/llui/lllineeditor.h')
-rw-r--r-- | indra/llui/lllineeditor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index f84625bea7..ae4e05c065 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -320,6 +320,8 @@ private: virtual S32 getPreeditFontSize() const; virtual LLWString getPreeditString() const { return getWText(); } + void setText(const LLStringExplicit &new_text, bool use_size_limit); + void setContextMenu(LLContextMenu* new_context_menu); protected: |