diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
| commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
| tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/llui/llaccordionctrltab.h | |
| parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
| parent | c683151587067cb2758206432610d4ff4884036e (diff) | |
Merged from 2.3.0-beta1 tag in viewer-development
Diffstat (limited to 'indra/llui/llaccordionctrltab.h')
| -rw-r--r-- | indra/llui/llaccordionctrltab.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h index d6ac8cbc8f..dddaa581e6 100644 --- a/indra/llui/llaccordionctrltab.h +++ b/indra/llui/llaccordionctrltab.h @@ -85,10 +85,10 @@ public: Optional<bool> selection_enabled; - Optional<S32> padding_left; - Optional<S32> padding_right; - Optional<S32> padding_top; - Optional<S32> padding_bottom; + Optional<S32> padding_left, + padding_right, + padding_top, + padding_bottom; Params(); }; @@ -170,7 +170,7 @@ public: virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); - virtual bool addChild(LLView* child, S32 tab_group); + virtual bool addChild(LLView* child, S32 tab_group = 0 ); bool isExpanded() const { return mDisplayChildren; } |