diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-13 10:02:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-13 10:02:26 -0400 |
| commit | 7b9708a2e3aede6faef04bd546c497dc68264f58 (patch) | |
| tree | c49b3779d7a1f2e94fa1d33396c882e3351a4797 /indra/llui/lltoolbar.h | |
| parent | d0eb9658f2698b9c200991e84c1a60be48788e2c (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
sunshine-external merge WIP
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rwxr-xr-x | indra/llui/lltoolbar.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 9e17eaed8b..370941c787 100755 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -138,7 +138,7 @@ namespace LLToolBarEnums TOOLBAR_LAST = TOOLBAR_BOTTOM, }; - LLLayoutStack::ELayoutOrientation getOrientation(SideType sideType); + LLView::EOrientation getOrientation(SideType sideType); } // NOTE: This needs to occur before Param block declaration for proper compilation. @@ -167,7 +167,6 @@ public: class LLCenterLayoutPanel : public LLLayoutPanel { public: - typedef struct LLLayoutPanel::Params Params; typedef boost::function<void(LLToolBarEnums::EToolBarLocation tb, const LLRect& rect)> reshape_callback_t; virtual ~LLCenterLayoutPanel() {} |