diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2016-11-16 11:21:54 -0500 | 
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2016-11-16 11:21:54 -0500 | 
| commit | ec5051699ac4ca22b608e09a66604dd6639fe6b1 (patch) | |
| tree | 84608d2581bd347af903db6d971165a887a922c8 | |
| parent | bedbb65b3341764ab9d076151514f7da200e6948 (diff) | |
STORM-2142 Tweaks to some of the 4 combined issues
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_scene_load_stats.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 6 | 
3 files changed, 4 insertions, 9 deletions
| diff --git a/doc/contributions.txt b/doc/contributions.txt index 1728f01c95..aaf884f0e9 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -755,6 +755,7 @@ Jonathan Yap  	STORM-2092  	STORM-2100  	STORM-2104 +	STORM-2142  Kadah Coba  	STORM-1060      STORM-1843 diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml index 4001609746..b53698a9f2 100644 --- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml @@ -7,7 +7,7 @@           save_rect="true"           save_visibility="true"           title="SCENE LOAD STATISTICS" -         width="270"> +         width="400">      <scroll_container follows="top|left|bottom|right"                        bottom="400"                        layout="topleft" @@ -15,14 +15,14 @@                        name="statistics_scroll"                        reserve_scroll_corner="true"                        top="20" -                      width="265"> +                      width="395">        <container_view follows="top|left|bottom|right"                        height="378"                        layout="topleft"                        left="2"                        name="statistics_view"                        top="20" -                      width="250" > +                      width="380" >  <!--Basic Section-->  		  <stat_view name="basic"                   label="Basic" diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml index bccda8a247..06d0b849a3 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml @@ -95,9 +95,6 @@          <on_click           function="Inventory.GearDefault.Custom.Action"           parameter="empty_lostnfound" /> -        <on_enable -         function="Inventory.GearDefault.Enable" -         parameter="not_empty" />      </menu_item_call>      <menu_item_separator       layout="topleft" /> @@ -155,8 +152,5 @@          <on_click           function="Inventory.GearDefault.Custom.Action"           parameter="empty_trash" /> -        <on_enable -         function="Inventory.GearDefault.Enable" -         parameter="not_empty" />      </menu_item_call>  </toggleable_menu> | 
