summaryrefslogtreecommitdiff
path: root/indra/llui/llconsole.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-02-11 11:44:21 -0800
committerCallum Prentice <callum@lindenlab.com>2010-02-11 11:44:21 -0800
commitc7715a74fd63c5dda370a5fe07089213a53014cb (patch)
treef9fda627380aa5f20d028482fc1999e4d3232166 /indra/llui/llconsole.h
parent494a42a680cdaa90dce677fd66ff722ccf1401f3 (diff)
parenta97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff)
Merge with tip
Diffstat (limited to 'indra/llui/llconsole.h')
-rw-r--r--indra/llui/llconsole.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
index 4719950f28..f38e2bc9c2 100644
--- a/indra/llui/llconsole.h
+++ b/indra/llui/llconsole.h
@@ -40,7 +40,7 @@
class LLSD;
-class LLConsole : public LLFixedBuffer, public LLUICtrl
+class LLConsole : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>
{
public:
typedef enum e_font_size
@@ -68,6 +68,9 @@ protected:
friend class LLUICtrlFactory;
public:
+ // call once per frame to pull data out of LLFixedBuffer
+ static void updateClass();
+
//A paragraph color segment defines the color of text in a line
//of text that was received for console display. It has no
//notion of line wraps, screen position, or the text it contains.
@@ -139,14 +142,12 @@ public:
// -1 = monospace, 0 means small, font size = 1 means big
void setFontSize(S32 size_index);
- void addLine(const std::string& utf8line, F32 size, const LLColor4 &color);
- void addLine(const LLWString& wline, F32 size, const LLColor4 &color);
// Overrides
/*virtual*/ void draw();
- /*virtual*/ void addLine(const std::string& utf8line);
- /*virtual*/ void addLine(const LLWString& line);
private:
+ void update();
+
F32 mLinePersistTime; // Age at which to stop drawing.
F32 mFadeTime; // Age at which to start fading
const LLFontGL* mFont;