diff options
| author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
| commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
| tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/llui/lltoolbar.h | |
| parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull and merge viewer-release as version 3.7.8
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() {} |