Skip to content
Snippets Groups Projects
Commit fd1a688f authored by Richard Nelson's avatar Richard Nelson
Browse files

fixed bad merge

parent a530382c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
indra/llui/lltoolbar.h
+ 2
− 2
View file @ fd1a688f
...@@ -47,8 +47,8 @@ class LLToolBarButton : public LLButton ...@@ -47,8 +47,8 @@ class LLToolBarButton : public LLButton
public: public:
struct Params : public LLInitParam::Block<Params, LLButton::Params> struct Params : public LLInitParam::Block<Params, LLButton::Params>
{ {
Optional<LLUI::RangeS32> button_width; Optional<LLUI::RangeS32::Params> button_width;
Optional<S32> desired_height; Optional<S32> desired_height;
Params() Params()
: button_width("button_width"), : button_width("button_width"),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment