diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
| commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
| tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/llui/lltextbase.h | |
| parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
| parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) | |
Merge from http://hg.secondlife.com/viewer-identity (display names)
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 1fa449a182..aafcf8ceb0 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -493,7 +493,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 appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params()); void appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false); |