diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-23 15:09:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-23 15:09:37 -0700 |
| commit | 1bcf6882c5faa94385f045e1c591da96408bb032 (patch) | |
| tree | dd1ad52f6c8dc166a413d3a7d78fc1e3836e7dac /indra/llui/lltoolbar.cpp | |
| parent | f50d28303c28fdccc5f06dcbc1147a9d3223d07f (diff) | |
EXP-1207 : More on lltoolbarview. Still not rendering
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 1e8be93f17..167dbfcc47 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -30,9 +30,7 @@ #include "boost/foreach.hpp" #include "lltoolbar.h" -// uncomment this and remove the one in llui.cpp when there is an external reference to this translation unit -// thanks, MSVC! -//static LLDefaultChildRegistry::Register<LLToolBar> r1("toolbar"); +static LLDefaultChildRegistry::Register<LLToolBar> r1("toolbar"); namespace LLToolBarEnums { @@ -62,7 +60,7 @@ LLToolBar::Params::Params() background_image("background_image") {} -LLToolBar::LLToolBar(const Params& p) +LLToolBar::LLToolBar(const LLToolBar::Params& p) : LLUICtrl(p), mButtonType(p.button_display_mode), mSideType(p.side), @@ -78,6 +76,9 @@ LLToolBar::LLToolBar(const Params& p) void LLToolBar::initFromParams(const LLToolBar::Params& p) { + // Initialize the base object + LLUICtrl::initFromParams(p); + LLLayoutStack::ELayoutOrientation orientation = getOrientation(p.side); LLLayoutStack::Params centering_stack_p; |