diff options
| author | callum <none@none> | 2009-12-28 13:45:57 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-28 13:45:57 -0800 |
| commit | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (patch) | |
| tree | 5d590d84a1fa6c8414adba0732a83a67a440dd37 /indra/llui/lltextbase.h | |
| parent | dd1fb1568e85a8e3622372cae21bcd3205051718 (diff) | |
| parent | 6008bf61b2d0475a274ad2b851b61e69496b5bf8 (diff) | |
Merge with (specific revision) and head
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index c91578b637..038b9eaa62 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -184,6 +184,7 @@ public: bool scrolledToEnd(); const LLFontGL* getDefaultFont() const { return mDefaultFont; } + LLStyle::Params getDefaultStyle(); public: // Fired when a URL link is clicked @@ -256,7 +257,6 @@ protected: LLTextBase(const Params &p); virtual ~LLTextBase(); void initFromParams(const Params& p); - LLStyle::Params getDefaultStyle(); virtual void onValueChange(S32 start, S32 end); // draw methods |