diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
| commit | ff09b049a7916a73301bd02f9810994025d88e06 (patch) | |
| tree | 2f2fe764116db1401fae342c1930be5e9a70a3e3 /indra/llui/lltextbase.h | |
| parent | 6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff) | |
| parent | 11fc2da6fa5fba0bb659dd97f8533e4529aece06 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 2 |
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 |