diff options
Diffstat (limited to 'indra/newview')
8 files changed, 59 insertions, 33 deletions
diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png Binary files differnew file mode 100644 index 0000000000..d7e0001dc6 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Shop.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 57f23c7e76..29c72a414b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -453,6 +453,7 @@ with the same filename but different name <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" /> <texture name="Shirt_Large" file_name="icons/Shirt_Large.png" preload="false" /> + <texture name="Shop" file_name="icons/Shop.png" preload="false" /> <texture name="SkipBackward_Off" file_name="icons/SkipBackward_Off.png" preload="false" /> <texture name="SkipForward_Off" file_name="icons/SkipForward_Off.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml index e3f6045e27..2edd643cc5 100644 --- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|right|left" - height="22" + height="23" layout="topleft" left="0" name="wearable_item" @@ -9,7 +9,7 @@ width="380"> <icon follows="top|right|left" - height="20" + height="23" image_name="ListItem_Over" layout="topleft" left="0" @@ -18,7 +18,7 @@ visible="false" width="380" /> <icon - height="20" + height="23" follows="top|right|left" image_name="ListItem_Select" layout="topleft" @@ -48,16 +48,28 @@ top="4" value="..." width="359" /> - <icon + <panel + background_visible="false" name="btn_lock" layout="topleft" follows="top|right" image_name="Locked_Icon" - top="2" + top="0" left="0" - height="13" - width="9" - tab_stop="false" /> + height="23" + width="23" + tab_stop="false"> + <icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + </panel> <button name="btn_edit" layout="topleft" @@ -65,8 +77,8 @@ image_overlay="Edit_Wrench" top="0" left_pad="3" - height="20" - width="20" + height="23" + width="23" tab_stop="false" /> <panel background_visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml index 9d19b89a61..dc123f13f4 100644 --- a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml @@ -25,12 +25,12 @@ follows="top|right" height="25" image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Shop" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" - label="Shop >" layout="topleft" right="-5" name="bodyparts_shop_btn" top="5" - width="61" /> + width="45" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml index 2359719c2a..5b3f0b17a9 100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml @@ -26,12 +26,12 @@ follows="top|right" height="25" image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Shop" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" - label="Shop >" layout="topleft" right="-5" name="clothing_shop_btn" top="5" - width="61" /> + width="45" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml index b1782f405e..035e8607ec 100644 --- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml @@ -9,7 +9,7 @@ width="380"> <icon follows="top|right|left" - height="20" + height="23" image_name="ListItem_Over" layout="topleft" left="0" @@ -18,7 +18,7 @@ visible="false" width="380" /> <icon - height="20" + height="23" follows="top|right|left" image_name="ListItem_Select" layout="topleft" @@ -66,8 +66,8 @@ image_overlay="UpArrow_Off" top="0" left="0" - height="20" - width="20" + height="23" + width="23" tab_stop="false" /> <button name="btn_move_down" @@ -76,18 +76,31 @@ image_overlay="DownArrow_Off" top="0" left_pad="3" - height="20" - width="20" + height="23" + width="23" tab_stop="false" /> - <icon + <panel + background_visible="false" name="btn_lock" layout="topleft" follows="top|right" image_name="Locked_Icon" - top="2" - left_pad="1" - height="13" - width="9" /> + top="0" + left="0" + height="23" + width="23" + tab_stop="false"> + <icon + name="btn_lock1" + layout="topleft" + follows="top|right" + image_name="Locked_Icon" + top="2" + left="5" + height="13" + width="9" + tab_stop="false" /> + </panel> <button name="btn_edit" layout="topleft" @@ -95,8 +108,8 @@ image_overlay="Edit_Wrench" top="0" left_pad="3" - height="20" - width="20" + height="23" + width="23" tab_stop="false" /> <panel background_visible="true" diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml index c5fbd1cae6..06371b7489 100644 --- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="top|right|left" - height="22" + height="23" layout="topleft" left="0" name="dummy_clothing_item" @@ -9,7 +9,7 @@ width="380"> <icon follows="top|right|left" - height="20" + height="23" image_name="ListItem_Over" layout="topleft" left="0" @@ -18,7 +18,7 @@ visible="false" width="380" /> <icon - height="20" + height="23" follows="top|right|left" image_name="ListItem_Select" layout="topleft" @@ -56,8 +56,8 @@ image_overlay="AddItem_Off" top="0" left="0" - height="20" - width="20" + height="23" + width="23" tab_stop="false" /> <panel background_visible="true" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 5a6b3ec096..3d7b0b7edc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -86,7 +86,7 @@ width="333"> </text> <button follows="left|top" - height="20" + height="23" image_overlay="Edit_Wrench" label="" layout="topleft" |
