summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-12 21:36:34 +0800
committerangela <angela@lindenlab.com>2009-11-12 21:36:34 +0800
commitff09b049a7916a73301bd02f9810994025d88e06 (patch)
tree2f2fe764116db1401fae342c1930be5e9a70a3e3 /indra/llui/lltexteditor.h
parent6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff)
parent11fc2da6fa5fba0bb659dd97f8533e4529aece06 (diff)
merge
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rw-r--r--indra/llui/lltexteditor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 10fc94dedc..fb014b86bf 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -168,7 +168,7 @@ public:
void appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo);
// Non-undoable
- void setText(const LLStringExplicit &utf8str);
+ void setText(const LLStringExplicit &utf8str, const LLStyle::Params& input_params = LLStyle::Params());
// Removes text from the end of document