diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:46:05 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:46:05 -0700 |
| commit | 6c57abb295447f2b44eb833cb77fa718dc2b1118 (patch) | |
| tree | 0d9e147ed0b6bbde05e7b9550386114a13416c10 /indra/llui/lltextbase.h | |
| parent | 87082996e6408919591ee3d408918a4425494dc9 (diff) | |
| parent | af914e4ab666aad041aa17f6459d1ff834440b44 (diff) | |
Merged from q/viewer-release
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 92876e20d6..fe8ebb1b80 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -196,6 +196,9 @@ public: const LLFontGL* getDefaultFont() const { return mDefaultFont; } + void appendLineBreakSegment(const LLStyle::Params& style_params); + void appendImageSegment(const LLStyle::Params& style_params); + public: // Fired when a URL link is clicked commit_signal_t mURLClickSignal; @@ -319,9 +322,6 @@ protected: void updateRects(); void needsScroll() { mScrollNeeded = TRUE; } void replaceUrlLabel(const std::string &url, const std::string &label); - - void appendLineBreakSegment(const LLStyle::Params& style_params); - void appendImageSegment(S32 highlight_part, const LLStyle::Params& style_params); 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); |