diff options
9 files changed, 346 insertions, 248 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 517204b232..0a83ba8212 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -820,15 +820,15 @@ void LLPanelGroupGeneral::reset() mCtrlListGroup->set(true); - mCtrlReceiveNotices->setEnabled(true); + mCtrlReceiveNotices->setEnabled(false); mCtrlReceiveNotices->setVisible(true); - mCtrlListGroup->setEnabled(true); + mCtrlListGroup->setEnabled(false); mGroupNameEditor->setEnabled(TRUE); mEditCharter->setEnabled(TRUE); - mCtrlShowInGroupList->setEnabled(TRUE); + mCtrlShowInGroupList->setEnabled(false); mComboMature->setEnabled(TRUE); mCtrlOpenEnrollment->setEnabled(TRUE); @@ -934,6 +934,8 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id) mCtrlListGroup->setEnabled(data.mID.notNull()); } + mCtrlShowInGroupList->setEnabled(data.mID.notNull()); + mActiveTitleLabel = getChild<LLTextBox>("active_title_label"); mComboActiveTitle = getChild<LLComboBox>("active_title"); diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index a3e5361e76..fed326c25e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -616,12 +616,15 @@ with the same filename but different name <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" /> <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Left_Over" file_name="containers/Toolbar_Left_Over.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Middle_Over" file_name="containers/Toolbar_Middle_Over.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> + <texture name="Toolbar_Right_Over" file_name="containers/Toolbar_Right_Over.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index f913c58cc9..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -241,14 +241,17 @@ Hover your mouse over the options for more help. tool_tip="Sets whether your group contains information rated as Moderate" top_pad="4" width="190"> + <combo_item name="select_mature" value="Select"> + - Select Mature - + </combo_item> <combo_box.item - label="General Content" - name="pg" - value="Not Mature" /> - <combo_box.item label="Moderate Content" name="mature" value="Mature" /> + <combo_box.item + label="General Content" + name="pg" + value="Not Mature" /> </combo_box> <check_box follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ee8bca6f83..639e5d30ef 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -3,22 +3,25 @@ name="Landmarks" top="0" height="400" - layout="topleft" + layout="topleft" left="0" - width="380" + width="313" help_topic="panel_landmarks" border="false" background_visible="true" - bg_alpha_color="DkGray2" + bg_alpha_color="DkGray" follows="all"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="360" + height="369" layout="topleft" - left="0" + left="3" name="landmarks_accordion" top="0" - width="380"> + width="307"> <accordion_tab layout="topleft" name="tab_favorites" @@ -33,7 +36,7 @@ mouse_opaque="true" name="favorites_list" start_folder="Favorites" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -49,7 +52,7 @@ mouse_opaque="true" name="landmarks_list" start_folder="Landmarks" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -65,7 +68,7 @@ mouse_opaque="true" name="my_inventory_list" start_folder="My Inventory" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -81,55 +84,64 @@ mouse_opaque="true" name="library_list" start_folder="LIBRARY" - width="380"/> + width="313"/> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new landmark" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-8" + left_pad="1" name="trash_btn" tool_tip="Remove selected landmark" - top="14" - width="18" /> + width="31" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index c7768c6eb6..bef62f48e0 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -417,15 +417,15 @@ background_opaque="true" follows="all" halign="center" - height="300" + height="306" layout="topleft" - left="6" + left="7" name="inventory filter tabs" tab_height="30" tab_position="top" tab_min_width="100" top_pad="10" - width="315"> + width="312"> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -442,7 +442,7 @@ name="All Items" sort_order_setting="InventorySortOrder" top="16" - width="290" /> + width="288" /> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -451,7 +451,7 @@ border="false" bevel_style="none" follows="all" - height="295" + height="293" label="RECENT" help_topic="recent_inventory_tab" layout="topleft" @@ -461,52 +461,61 @@ </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" bevel_style="none" follows="left|right|bottom" - height="38" + height="27" layout="topleft" - top_pad="-1" - left="9" + top_pad="4" + left="10" name="bottom_panel" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new item" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left_pad="1" layout="topleft" - right="-7" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index cc60b97f92..66ef373168 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Outfits" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + background_opaque="true" background_visible="true" follows="all" height="570" @@ -11,15 +14,15 @@ border="false"> <tab_container follows="all" - height="490" + height="497" layout="topleft" - left="6" + left="7" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" - width="315"> + width="312"> <inventory_panel background_visible="true" background_opaque="true" @@ -30,7 +33,7 @@ border="false" left="0" top="0" - width="314" + width="315" mouse_opaque="true" name="outfitslist_tab" start_folder="My Outfits" /> @@ -47,53 +50,53 @@ mouse_opaque="true" name="cof_tab" start_folder="Current Outfit" - width="313" /> + width="315" /> </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" - follows="left|right|bottom" - height="38" - layout="topleft" - left="9" - visible="true" - top_pad="-1" - width="310" /> - <panel - background_visible="false" follows="bottom|left" height="73" layout="topleft" left="9" + top_pad="3" visible="true" name="bottom_panel" - top_pad="-38" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="1" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> + <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-9" + left_pad="1" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> <button follows="bottom|left" height="23" @@ -101,7 +104,7 @@ layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" - top="43" + top_pad="6" left="0" width="153" /> <button @@ -111,7 +114,6 @@ layout="topleft" name="wear_btn" left_pad="3" - top="43" tool_tip="Wear selected outfit" width="152" /> <button @@ -126,4 +128,4 @@ width="20" /> </panel> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 13791a6d32..85841da48f 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -2,13 +2,13 @@ <!-- Side tray panel --> <panel follows="all" + height="449" label="People" layout="topleft" - height="449" + left="0" min_height="350" name="people_panel" top="0" - left="0" width="333"> <string name="no_people" @@ -39,7 +39,6 @@ name="no_groups_msg" value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor - text_pad_left="10" follows="left|top|right" height="23" layout="topleft" @@ -48,6 +47,7 @@ max_length="300" name="filter_input" text_color="Black" + text_pad_left="10" top="3" width="303" /> <tab_container @@ -63,10 +63,10 @@ halign="center" width="317"> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="NEARBY" @@ -78,56 +78,70 @@ width="313"> <avatar_list allow_select="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" ignore_online_status="true" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" - tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="nearby_view_sort_btn" - top="10" - width="18" /> + tool_tip="Options" + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY FRIENDS" @@ -138,13 +152,16 @@ top="0" width="313"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="friends_accordion" top="0" - width="313"> + width="307"> <accordion_tab layout="topleft" height="172" @@ -160,7 +177,7 @@ multi_select="true" name="avatars_online" top="0" - width="313" /> + width="307" /> </accordion_tab> <accordion_tab layout="topleft" @@ -176,53 +193,64 @@ multi_select="true" name="avatars_all" top="0" - width="313" /> + width="307" /> </accordion_tab> </accordion> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="friends_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Offer friendship to a Resident" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="210" + /> <button follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - image_disabled="TrashItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - left_pad="10" - right="-10" + left_pad="1" name="del_btn" tool_tip="Remove selected person from your Friends list" - top_delta="0" - width="18" /> + width="31" /> </panel> <text follows="all" @@ -237,10 +265,10 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t </text> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY GROUPS" @@ -255,18 +283,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() --> <group_list + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="group_list" no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -275,45 +307,56 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="groups_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="plus_btn" tool_tip="Join group/Create new group" - width="18" /> + width="31" /> <button follows="bottom|left" - height="10" - image_hover_selected="Activate_Checkmark" - image_selected="Activate_Checkmark" - image_unselected="Activate_Checkmark" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Activate_Checkmark" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="activate_btn" tool_tip="Activate selected group" - top_delta="4" - width="10" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="RECENT" @@ -325,18 +368,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t width="313"> <avatar_list allow_select="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" show_last_interaction_time="true" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -345,30 +392,40 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="recent_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" - top_delta="0" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> </tab_container> @@ -377,7 +434,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t height="23" layout="topleft" left="8" - top_pad="0" + top_pad="4" name="button_bar" width="313"> <button @@ -387,6 +444,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information" + top="0" width="70" /> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index ff5d89470c..c61007a9e1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -65,7 +65,7 @@ background_visible="true" visible="false" width="315" /> <panel - height="19" + height="23" layout="topleft" left="4" name="button_panel" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 0d4f67f94c..cbcaf1a58c 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Teleport History" bottom="0" height="400" left="0" width="380" +<panel name="Teleport History" bottom="0" height="400" left="0" width="313" help_topic="panel_teleport_history" - border="false" follows="left|top|right|bottom"> + border="false" follows="left|top|right|bottom" + background_visible="true" + bg_alpha_color="DkGray"> <accordion follows="left|top|right|bottom" - height="368" + height="369" layout="topleft" - left="0" + left="3" top="0" name="history_accordion" background_visible="true" bg_alpha_color="DkGray2" - width="380"> + width="307"> <accordion_tab layout="topleft" name="today" @@ -23,7 +25,7 @@ left="0" name="today_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -37,7 +39,7 @@ left="0" name="yesterday_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -51,7 +53,7 @@ left="0" name="2_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -65,7 +67,7 @@ left="0" name="3_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -79,7 +81,7 @@ left="0" name="4_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -93,7 +95,7 @@ left="0" name="5_days_ago_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -107,7 +109,7 @@ left="0" name="6_days_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -121,7 +123,7 @@ left="0" name="1_month_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -135,34 +137,41 @@ left="0" name="6_months_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="273" + /> </panel> </panel> |