diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/llui/llconsole.h | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/llui/llconsole.h')
| -rw-r--r-- | indra/llui/llconsole.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h index 56e1614948..5800a82922 100644 --- a/indra/llui/llconsole.h +++ b/indra/llui/llconsole.h @@ -34,14 +34,13 @@ #define LL_LLCONSOLE_H #include "llfixedbuffer.h" -#include "llview.h" +#include "lluictrl.h" #include "v4color.h" #include <deque> -class LLFontGL; class LLSD; -class LLConsole : public LLFixedBuffer, public LLView +class LLConsole : public LLFixedBuffer, public LLUICtrl { public: typedef enum e_font_size @@ -51,7 +50,7 @@ public: BIG = 1 } EFontSize; - struct Params : public LLInitParam::Block<Params, LLView::Params> + struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { Optional<U32> max_lines; Optional<F32> persist_time; |