summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.h
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-13 08:43:56 +0800
committerangela <angela@lindenlab.com>2009-11-13 08:43:56 +0800
commit0d4ccb9d1c0761864c8b0c19f0bdd1700b425837 (patch)
tree717db44548966f400b3d2cfb84817b01761f70b7 /indra/llui/lltextbase.h
parentfd9257a5f2649d7afbf65067c0fa4653fc81272c (diff)
parentb4a3b65a602ad56baf761a8426093eda585bc572 (diff)
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui/lltextbase.h')
-rw-r--r--indra/llui/lltextbase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index fb01cd1e7c..70d78c77cd 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -137,7 +137,7 @@ public:
// Text accessors
// TODO: add optional style parameter
- virtual void setText(const LLStringExplicit &utf8str); // uses default style
+ virtual void setText(const LLStringExplicit &utf8str , const LLStyle::Params& input_params = LLStyle::Params()); // uses default style
virtual std::string getText() const;
// wide-char versions