diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-23 09:21:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-23 09:21:52 +0100 |
| commit | af914e4ab666aad041aa17f6459d1ff834440b44 (patch) | |
| tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/llui/lltextbase.cpp | |
| parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) | |
| parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 2d0d5c12cb..17e41d9e24 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1630,7 +1630,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para // Text will be replaced during rendering with the icon, // but string cannot be empty or the segment won't be // added (or drawn). - appendImageSegment(part, icon); + appendImageSegment(icon); } } @@ -1702,7 +1702,7 @@ void LLTextBase::appendLineBreakSegment(const LLStyle::Params& style_params) insertStringNoUndo(getLength(), utf8str_to_wstring("\n"), &segments); } -void LLTextBase::appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params) +void LLTextBase::appendImageSegment(const LLStyle::Params& style_params) { if(getPlainText()) { |