diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 15:36:52 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 15:36:52 -0400 |
commit | 6f5790da38b3005292d3dbeaad778ea740110e33 (patch) | |
tree | b28ce7a7a158f72f4dbfda60bafff2317c671837 /indra/llui/lllayoutstack.h | |
parent | 56e2f11417183d8dcc3d681f79fc63446b236abb (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Merge. Pull in viewer-release after 3.6.7 release.
Diffstat (limited to 'indra/llui/lllayoutstack.h')
-rwxr-xr-x | indra/llui/lllayoutstack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index b570974bd6..add43fa741 100755 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -38,6 +38,7 @@ class LLLayoutPanel; class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack> { public: + typedef enum e_layout_orientation { HORIZONTAL, |