diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltoolbar.h | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 6 | 
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 9e48dee608..84fa7ec0df 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"), diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index d36b015005..60e7c34d84 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -33,9 +33,9 @@                 image_pressed="PushButton_Press"                 image_pressed_selected="PushButton_Selected_Press"                 image_selected="PushButton_Selected_Press" -               desired_height="35" -               button_width.min="35" -               button_width.max="35"                +               desired_height="38" +               button_width.min="38" +               button_width.max="38"                                follows="left|top"                 label=""                 chrome="true"  | 
