diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml | 6 | 
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 203f7d7f9f..276fd3c878 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -595,6 +595,7 @@ Jonathan Yap  	STORM-1719  	STORM-1712  	STORM-1728 +	STORM-1736  	STORM-1733  Kadah Coba  	STORM-1060 diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 5fe8f3c114..a2739a8339 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -3,7 +3,7 @@   legacy_header_height="18"   background_visible="true"   default_tab_group="1" - height="350" + height="355"   help_topic="floater_im_box"   layout="topleft"   name="panel_im" diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml index e70abc0975..93cafd4a53 100644 --- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml @@ -58,7 +58,7 @@               label="Call"               name="call_btn"               width="130" -             top="5" /> +             top="0" />          </layout_panel>          <layout_panel           auto_resize="false" @@ -75,7 +75,7 @@               height="20"               label="Leave Call"               name="end_call_btn" -             top="5"/> +             top="0"/>          </layout_panel>          <layout_panel           auto_resize="false" @@ -92,7 +92,7 @@               height="20"               label="Voice Controls"               name="voice_ctrls_btn" -             top="5" +             top="0"               use_ellipses="true" />          </layout_panel>      </layout_stack>  | 
