diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
| commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
| tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/llui/lltextbase.h | |
| parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index e5dfecad54..aafcf8ceb0 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -235,6 +235,7 @@ class LLTextBase public: friend class LLTextSegment; friend class LLNormalTextSegment; + friend class LLUICtrlFactory; struct LineSpacingParams : public LLInitParam::Choice<LineSpacingParams> { @@ -492,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); |