diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:21:01 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:21:01 -0700 |
| commit | fd1a688f463703ec78a399b35fed19b3d907c91b (patch) | |
| tree | cc8537210b3624ab632a05de05c8a97c47c41ac7 /indra | |
| parent | a530382c257809c6ee4371156f332efaaa0e23d9 (diff) | |
fixed bad merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltoolbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index ca04a0e5d5..321064a0fd 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -47,8 +47,8 @@ class LLToolBarButton : public LLButton public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { - Optional<LLUI::RangeS32> button_width; - Optional<S32> desired_height; + Optional<LLUI::RangeS32::Params> button_width; + Optional<S32> desired_height; Params() : button_width("button_width"), |