Pull from lindenlab/viewer-development

15 files changed, 123 insertions, 87 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
index bf0913fde7..9f14e9ae0a 100644
--- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
@@ -2,7 +2,8 @@
 <floater
  can_close="false"
  can_resize="true"
- min_width="150"
+ min_width="333"
+ min_height="440"
  save_rect="true"
  save_visibility="true"
  >
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index 92752a0fee..22796f7b68 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -31,6 +31,14 @@
      function="CheckControl"
      parameter="FriendsListShowIcons" />
   </menu_item_check>
+  <menu_item_check name="view_permissions" label="View Permissions Granted">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_permissions" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowPermissions" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
index 747352cb29..84ab16c709 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
@@ -10,4 +10,14 @@
         <on_click
          function="Gear.Edit" />
     </menu_item_call>
+    <menu_item_call
+     label="Take Off"
+     layout="topleft"
+     name="takeoff">
+        <on_click
+         function="Gear.TakeOff" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="take_off" />
+    </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index f58715be56..b385654010 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -65,11 +65,55 @@
      height="15"
      layout="topleft"
      left_pad="5"
-     right="-72"
+     right="-164"
      name="last_interaction"
      text_color="LtGray_50"
      value="0s"
      width="35" />
+    <icon
+     height="20"
+     follows="right"
+     image_name="Permission_Visible_Online"
+     layout="topleft"
+     left_pad="3"
+     right="-141"
+     name="permission_online_icon"
+     tool_tip="This friend can see when you&apos;re online"
+     top="2"
+     width="20" />
+    <icon
+     height="20"
+     follows="right"
+     image_name="Permission_Visible_Map"
+     layout="topleft"
+     left_pad="3"
+     tool_tip="This friend can locate you on the map"
+     right="-118"
+     name="permission_map_icon"
+     top_delta="0"
+     width="20" />
+    <icon
+     height="20"
+     follows="right"
+     image_name="Permission_Edit_Objects_Mine"
+     layout="topleft"
+     left_pad="3"
+     right="-95"
+     name="permission_edit_mine_icon"
+     tool_tip="This friend can edit, delete or take your objects"
+     top_delta="0"
+     width="20" />
+    <icon
+     height="20"
+     follows="right"
+     image_name="Permission_Edit_Objects_Theirs"
+     layout="topleft"
+     left_pad="3"
+     right="-72"
+     name="permission_edit_theirs_icon"
+     tool_tip="You can edit this friend&apos;s objects"
+     top_delta="0"
+     width="20" />
     <button
      follows="right"
      height="16"
@@ -80,7 +124,7 @@
      right="-53"
      name="info_btn"
      tab_stop="false"
-     top_delta="-2"
+     top_delta="2"
      width="16" />
     <button
      follows="right"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index eb02d4104b..2a3add161a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -84,7 +84,7 @@ background_visible="true"
       follows="all"
      left="8"
      top_pad="0"
-     height="536"
+     height="506"
      width="292"
      border_size="0">
    <layout_panel
@@ -176,15 +176,27 @@ background_visible="true"
          </accordion_tab>
          </accordion>
    </layout_panel>
-   <layout_panel
+  </layout_stack>
+  
+  <layout_stack
+     name="layout"
+     orientation="horizontal"
+     follows="bottom|left|right"
+     left="8"
+     top_pad="0"
+     height="30"
+     width="292"
+     border_size="0">
+     
+     	<layout_panel
          height="30"
          layout="topleft"
          auto_resize="false"
          left="0"
          top_pad="0"
-   name="button_row"
-   follows="bottom|left|right"
-   width="313">
+	     name="button_row"
+	     follows="bottom|left|right"
+	     width="313">
    
    		   <layout_stack
 	     	follows="bottom|left|right"
@@ -307,5 +319,7 @@ background_visible="true"
      visible="false"
      width="65" />-->
      </layout_panel>
-  </layout_stack>
+     
+     </layout_stack>
+  
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index c5d6aced7a..f8ae238148 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -57,7 +57,7 @@
      translate="false"
      value="Parcel_R_Dark" />
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index 63c522ac69..84b5d11ba7 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -26,7 +26,7 @@
    </text> -->
     <tab_container
      follows="all"
-     height="575"
+     height="555"
      halign="center"
      layout="topleft"
      left="5"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 684d38146a..37a1ed3048 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -41,7 +41,7 @@
      layout="topleft"
      left="0"
      top="0"
-     height="522"
+     height="510"
      width="315"
      border_size="0">
       <layout_panel
@@ -324,82 +324,25 @@
           </panel>
         </scroll_container>
       </layout_panel>
-      <!-- <layout_panel
-     follows="bottom|left"
+      </layout_stack>
+ 	<panel
+     follows="bottom|left|right"
+     height="23"
      layout="topleft"
      left="0"
-     name="profile_buttons_panel"
-     height="28"
-     width="313">
-         <button
-         follows="bottom|left"
-         height="23"
-         label="Add Friend"
-         layout="topleft"
-         left="0"
-         mouse_opaque="false"
-         name="add_friend"
-         tool_tip="Offer friendship to the Resident"
-         top="5"
-         width="80" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="IM"
-         layout="topleft"
-         name="im"
-         top="5"
-         left_pad="3"
-         width="45" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Call"
-         layout="topleft"
-         name="call"
-         left_pad="3"
-         top="5"
-         width="45" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         name="show_on_map_btn"
-         top="5"
-         left_pad="3"
-         width="45" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         name="teleport"
-         left_pad="3"
-         top="5"
-         width="85" />
- </panel>-->
- <layout_panel
-     follows="bottom|left"
-     layout="topleft"
-     left="0"
-     top_pad="0"
+     top_pad="1"
      name="profile_me_buttons_panel"
      visible="false"
-     user_resize="false" 
-     auto_resize="false" 
-     height="28"
      width="315">
         <button
          follows="bottom"
          height="23"
          left="6"
-	 top="1"
+	 	 top="1"
          label="Edit Profile"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
          width="152" />
- </layout_panel>
-</layout_stack>
+ 	</panel>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 530e191952..124b1cfc6b 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="533"
+ height="515"
  label="Notes &amp; Privacy"
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 1cbdecab9d..883cbb30c6 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -295,7 +295,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          auto_resize="true"
          default_tab_group="3"
          height="450"
-         min_height="73"
+         min_height="80"
          name="add_wearables_panel"
          width="313"
          tab_group="2"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 059283ce09..ab8930c967 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -192,6 +192,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          left="0"
                          multi_select="true"
                          name="avatars_online"
+                         show_permissions_granted="true"
                          top="0"
                          width="307" />
                 </accordion_tab>
@@ -208,6 +209,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          left="0"
                          multi_select="true"
                          name="avatars_all"
+                         show_permissions_granted="true"
                          top="0"
                          width="307" />
                 </accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 647be28a62..4f7c4fa9b2 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
  <accordion
   fit_parent="true" 
   follows="all"
-  height="470"
+  height="485"
   layout="topleft"
   left="0"
   name="accordion"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 88d7e68894..e2cd27c419 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="540"
+ height="430"
  label="Profile"
  layout="topleft"
  left="0"
@@ -41,7 +41,7 @@
      layout="topleft"
      left="0"
      top="0"
-     height="524"
+     height="400"
      width="317"
      border_size="0">
       <layout_panel
@@ -50,7 +50,7 @@
          layout="topleft"
          top="0"
          left="0"
-         height="524"
+         height="400"
          width="317">
         <scroll_container
          color="DkGray2"
@@ -304,11 +304,25 @@
           </panel>
         </scroll_container>
       </layout_panel>
-      <layout_panel
+           
+</layout_stack>
+
+	<layout_stack
+     name="layout_verb_buttons"
+     orientation="horizontal"
+     follows="bottom|left|right"
+     layout="topleft"
+     left="2"
+     top_pad="1"
+     height="30"
+     width="315"
+     border_size="0">
+     	<layout_panel
          follows="bottom|left"
          height="30"
          layout="topleft"
          name="profile_buttons_panel"
+         top="0"
          auto_resize="false"
          width="317">
          	
@@ -448,6 +462,6 @@
          tool_tip="Edit your personal information"
          width="130" />
         </layout_panel>
+     </layout_stack>
 
-</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 41c7b95c9f..3b4d6ae58d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -56,7 +56,7 @@
      width="150" />
     <tab_container
      follows="all"
-     height="538"
+     height="515"
      halign="center"
      layout="topleft"
      left="5"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cf040b10c7..72639f08ee 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2019,6 +2019,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>
+	<string name="Invalid Attachment">Invalid Attachment Point</string>
 
   <!-- Avatar age computation, see LLDateUtil::ageFromDate -->
   <string name="YearsMonthsOld">[AGEYEARS] [AGEMONTHS] old</string>
@@ -2182,7 +2183,6 @@ Clears (deletes) the media and all params from the given face.
 	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
 	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
-	<string name="Bad attachment point">Invalid Attachment Point</string>
 			
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>