diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-23 20:00:48 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-23 20:00:48 +0200 |
| commit | 46948d9fcc9149c3c416167f166aff6ce8fa88d5 (patch) | |
| tree | 2ee2b7d629c2cfd11b83483f193bcdf6c41927d8 /indra/llui | |
| parent | b0ed2ab7d92d79f0bb7005a7533c5c0e42f5bce7 (diff) | |
Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make Voice states and fade timeout xml driven)
-- made Avatar Item Voice States xml driven. Added fake xml panel file with one textbox per style.
Style of the appropriate textbox is applied to avatar item's name
-- It was necessary to change visibility of the LLTExtBase::getDefaultStyle() to public.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -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 |