diff options
| author | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
| commit | f79ac664dd6eead75368ced40110b6f0474aa92e (patch) | |
| tree | b24c616c96d32e0b20c5dd0a217701922f884ee6 /indra/llui/lltextbase.h | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (diff) | |
| parent | 56e0d59ebcc98515c24f7706569b6e7362981432 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 176308c61a..7041b9a109 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -314,7 +314,11 @@ protected: // misc void updateRects(); void needsScroll() { mScrollNeeded = TRUE; } - void replaceUrlLabel(const std::string &url, const std::string &label); + + struct URLLabelCallback; + // Replace a URL with a new icon and label, for example, when + // avatar names are looked up. + void replaceUrl(const std::string &url, const std::string &label, const std::string& icon); void appendLineBreakSegment(const LLStyle::Params& style_params); void appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params); |