Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge

# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml

15 files changed, 218 insertions, 114 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index ce788654aa..19b3c3160c 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -211,22 +211,12 @@
               <button.commit_callback
                 function="MediaBrowser.OpenWebBrowser" />
             </button>
-            <check_box
-             control_name="UseExternalBrowser"
-             follows="bottom|left"
-             height="20"
-             label="Always open in my web browser"
-             layout="topleft"
-             left_pad="5"
-             name="open_always"
-             top_delta="0"
-             width="200" />
             <button
              follows="bottom|right"
              height="20"
              label="Close"
              layout="topleft"
-             left_pad="80"
+             left_pad="285"
              name="close"
              top_delta="0"
              width="70">
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index c4ac936334..28b735d297 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="460"
- min_height="460"
+ height="475"
+ min_height="475"
  layout="topleft"
  name="gesture_preview"
  help_topic="gesture_preview"
@@ -297,11 +297,20 @@
     <check_box
      follows="top|left"
      height="20"
+     label="until key is released"
+     layout="topleft"
+     left="28"
+     name="wait_key_release_check"
+     top="330"
+     width="100" />
+    <check_box
+     follows="top|left"
+     height="20"
      label="until animations are done"
      layout="topleft"
      left="28"
      name="wait_anim_check"
-     top="330"
+     top_delta="20"
      width="100" />
     <check_box
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 3b58cd08f6..2101000294 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -7,14 +7,16 @@
  name="regioninfo"
  save_rect="true"
  title="REGION/ESTATE"
- width="530">
+ width="637">
     <tab_container
      bottom="555"
      follows="left|right|top|bottom"
      layout="topleft"
-     left="1"
+     left="0"
      name="region_panels"
-     right="-1"
-     tab_position="top"
+     tab_padding_right="3"
+     tab_position="left"
+     halign="left"
+     tab_width="110"
      top="20"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 3a8f360e2d..b19fe99e4b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -144,6 +144,14 @@
          parameter="rename" />
     </menu_item_call>
     <menu_item_call
+     label="New Folder"
+     layout="topleft"
+     name="New Listing Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
      label="New Outfit"
      layout="topleft"
      name="New Outfit">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0bfdead6e7..7e26faf4da 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -64,6 +64,14 @@
          function="Floater.ToggleOrBringToFront"
          parameter="camera" />
       </menu_item_call>
+      <menu_item_call
+       label="Notifications..."
+       name="Notifications"
+       shortcut="alt|shift|N">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="notification_well_window" />
+      </menu_item_call>
 
       <menu_item_separator/>
       <menu_item_check
@@ -391,6 +399,16 @@
            function="Self.EnableRemoveAllAttachments" />
         </menu_item_call>
       </menu>
+      <menu_item_call
+       label="Remove selected attachments"
+       layout="topleft"
+       name="Remove Selected Attachments"
+       shortcut="alt|shift|R">
+        <menu_item_call.on_click
+         function="Attachment.Detach" />
+        <menu_item_call.on_enable
+         function="Attachment.EnableDetach" />
+      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
         label="Complete avatars..."
@@ -742,6 +760,33 @@
              function="Floater.Show"
              parameter="360capture" />
         </menu_item_call>
+        <menu
+         create_jump_keys="true"
+         label="Zoom level"
+         name="Zoom menu"
+         tear_off="true">
+            <menu_item_call
+             label="Zoom out"
+             name="Zoom Out"
+             shortcut="control|8">
+                <menu_item_call.on_click
+                 function="View.ZoomOut" />
+            </menu_item_call>
+            <menu_item_call
+             label="Default"
+             name="Zoom Default"
+             shortcut="control|9">
+                <menu_item_call.on_click
+                 function="View.ZoomDefault" />
+            </menu_item_call>
+            <menu_item_call
+             label="Zoom in"
+             name="Zoom In"
+             shortcut="control|0">
+                <menu_item_call.on_click
+                 function="View.ZoomIn" />
+            </menu_item_call>
+        </menu>
         <menu_item_separator/>
         <menu_item_call
          label="Place profile"
@@ -2373,29 +2418,6 @@ function="World.EnvPreset"
                  function="View.EnableLastChatter" />
             </menu_item_call>
 
-            <menu_item_separator/>
-
-            <menu_item_call
-             label="Zoom In"
-             name="Zoom In"
-             shortcut="control|0">
-                <menu_item_call.on_click
-                 function="View.ZoomIn" />
-            </menu_item_call>
-            <menu_item_call
-             label="Zoom Default"
-             name="Zoom Default"
-             shortcut="control|9">
-                <menu_item_call.on_click
-                 function="View.ZoomDefault" />
-            </menu_item_call>
-            <menu_item_call
-             label="Zoom Out"
-             name="Zoom Out"
-             shortcut="control|8">
-                <menu_item_call.on_click
-                 function="View.ZoomOut" />
-            </menu_item_call>
         </menu> <!--Shortcuts-->
 
         <menu_item_separator/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d1838fc7ef..36538c406b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4399,14 +4399,28 @@ Are you sure you want to return the selected objects to their owners? Transferab
    icon="alert.tga"
    name="GroupLeaveConfirmMember"
    type="alert">
-You are currently a member of the group &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
-Leave Group?
+Leave the group &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+Currently, the fee to join this &quot;group&quot; is L$ [COST].
     <tag>group</tag>
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
-     yestext="OK"/>
+     yestext="Leave"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="GroupLeaveConfirmMemberNoFee"
+   type="alert">
+Leave the group &apos;&lt;nolink&gt;[GROUP]&lt;/nolink&gt;&apos;?
+There is currently no fee to join this group.
+    <tag>group</tag>
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Leave"/>
   </notification>
 
 
@@ -6169,6 +6183,33 @@ Are you sure you want to delete them?
      notext="Cancel"
      yestext="OK"/>
   </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteWornItems"
+   type="alertmodal">
+    <unique/>
+Some item(s) you wish to delete are being worn on your avatar.
+Remove these items from your avatar?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Remove item(s) and delete"/>
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="CantDeleteRequiredClothing"
+   type="alertmodal">
+    <unique/>
+Some item(s) you wish to delete are required clothing layers (skin, shape, hair, eyes).
+You must replace those layers before deleting them.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -6457,14 +6498,6 @@ Your trash is overflowing. This may cause problems logging in.
   </notification>
 
   <notification
-   icon="notifytip.tga"
-   name="InventoryLimitReachedAIS"
-   type="notifytip">
-Your inventory is experiencing issues. Please, contact support.
-  <tag>fail</tag>
-  </notification>
-
-  <notification
    icon="alertmodal.tga"
    name="InventoryLimitReachedAISAlert"
    type="alertmodal">
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 5eafb5cdf1..472eb319bb 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -65,7 +65,7 @@ Hover your mouse over the options for more help.
      width="168" />
     <text
     font="SansSerifMedium"
-    text_color="EmphasisColor"
+    text_color="white"
      type="string"
      follows="left|top"
      height="16"
@@ -75,14 +75,14 @@ Hover your mouse over the options for more help.
      top_pad="10"
      visible="true"
      width="190">
-      Free
+      No charge to join
     </text>
     <button
      follows="left|top"
      left_delta="0"
      top_pad="6"
      height="23"
-     label="JOIN NOW!"
+     label="Join group"
      name="btn_join"
      visible="true"
      width="120" />
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 05de249d22..d2b0eb4b7c 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
@@ -22,10 +22,10 @@ background_visible="true"
      name="group_join_btn">
         Join (L$[AMOUNT])
     </panel.string>
-    <panel.string
-     name="group_join_free">
-        Free
-    </panel.string>
+    <panel.string name="group_join_free">No charge to join</panel.string>
+    <panel.string name="group_member">You are a member</panel.string>
+    <panel.string name="join_txt">Join group</panel.string>
+    <panel.string name="leave_txt">Leave</panel.string>
     <panel
       name="group_info_top"
       follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index e758a8ce30..c8b165e869 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -49,6 +49,18 @@
      value="Unknown"
      width="242" />
     <button
+     name="notices_btn"
+     tool_tip="Group Notices"
+     top_delta="-4"
+     left_pad="3"
+     right="-53"
+     height="20"
+     width="20"
+     follows="right"
+     image_pressed="Group_Notices"
+     image_unselected="Group_Notices"
+     tab_stop="false"/>
+    <button
      follows="right"
      height="16"
      image_pressed="Info_Press"
@@ -58,7 +70,7 @@
      name="info_btn"
      tool_tip="More info"
      tab_stop="false"
-     top_delta="-2"
+     top_delta="2"
      width="16" />
    <!--*TODO: Should only appear on rollover-->
     <button
@@ -71,6 +83,6 @@
      name="profile_btn"
      tab_stop="false"
      tool_tip="View profile"
-     top_delta="-2"
+     top_delta="0"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index b72af7221e..9e19588033 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -54,9 +54,22 @@
      use_ellipses="true"
     />
     <button
+     name="notices_btn"
+     tool_tip="Group Notices"
+     top_delta="-4"
+     left_pad="3"
+     right="-80"
+     height="20"
+     width="20"
+     follows="right"
+     image_pressed="Group_Notices"
+     image_unselected="Group_Notices"
+     tab_stop="false"
+     visible="false"/>
+    <button
      name="visibility_hide_btn"
      tool_tip="Hide group on my profile"
-     top_delta="-3"
+     top_delta="0"
      left_pad="3"
      right="-53"
      height="20"
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 f7a9c552cc..33ae68c5e1 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -217,6 +217,7 @@
        tab_height="30"
        tab_position="top"
        tab_min_width="100"
+       use_tab_offset="true"
        top="0">
         <inventory_panel
          bg_opaque_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index f899f83ad4..6ae4890777 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -22,6 +22,7 @@
     <thumbnail
      name="real_world_pic"
      image_name="Generic_Person_Large"
+     show_loading="false"
      follows="top|left"
      layout="topleft"
      top="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index fea7d1bcb8..307b7b83ef 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -5,7 +5,7 @@
  top="0"
  left="0"
  height="480"
- width="420"
+ width="440"
  follows="all"
  layout="topleft"
 >
@@ -14,8 +14,11 @@
   so display it as an UTC+0
   -->
    <string 
-    name="date_format"
+    name="date_format_full"
     value="SL birthdate: [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]" />
+   <string 
+    name="date_format_short"
+    value="SL birthdate: [mth,datetime,utc] [day,datetime,utc]" />
    <string
     name="age_format"
     value="[AGE]" />
@@ -53,7 +56,7 @@ Account: [ACCTTYPE]
    top="8"
    left="6"
    bottom="-1"
-   width="160"
+   width="180"
    border_size="0"
    follows="left|top|bottom"
    layout="topleft"
@@ -71,6 +74,7 @@ Account: [ACCTTYPE]
       <thumbnail
        name="2nd_life_pic"
        image_name="Generic_Person_Large"
+       show_loading="false"
        layout="topleft"
        follows="all"
        interactable="true"
@@ -322,74 +326,81 @@ Account: [ACCTTYPE]
        visible="true"/>
     </layout_panel>
     <layout_panel
+     name="menu_panel"
+     follows="all"
+     layout="topleft"
+     height="55"
+     auto_resize="false"
+     user_resize="false">
+      <menu_button
+       layout="topleft"
+       follows="left|top"
+       left="1"
+       top="25"
+       height="25"
+       width="176"
+       label="Actions"
+       halign="left"
+       image_unselected="DropDown_Off"
+       image_selected="DropDown_On"
+       image_pressed="DropDown_Press"
+       image_pressed_selected="DropDown_Press"
+       image_disabled="DropDown_Disabled"
+       name="agent_actions_menu"/>
+    </layout_panel>
+    <layout_panel
      name="settings_panel"
      follows="all"
      layout="topleft"
-     height="50"
+     height="70"
      auto_resize="false"
      user_resize="false">
       <!-- only for self -->
-      <text
-       name="search_label"
-       value="Show my profile in search:"
-       top="1"
-       left="6"
-       right="-1"
-       height="16"
-       follows="left|top|right"
-       layout="topleft"/>
       <combo_box
        name="show_in_search"
        tool_tip="Let people see you in search results"
        left="1"
-       top="18"
-       height="23"
-       width="140"
+       top="5"
+       height="25"
+       width="176"
        follows="left|top"
        layout="topleft"
-       visible="true"
        enabled="false">
         <combo_box.item
-           name="Hide"
-           label="Hide"
-           value="0" />
-        <combo_box.item
            name="Show"
-           label="Show"
+           label="Show me in search"
            value="1" />
+        <combo_box.item
+           name="Hide"
+           label="Don't show me in search"
+           value="0" />
       </combo_box>
-    </layout_panel>
-    
-    <layout_panel
-     name="menu_panel"
-     follows="all"
-     layout="topleft"
-     height="55"
-     auto_resize="false"
-     user_resize="false"
-        >
-      <menu_button
-       layout="topleft"
-       follows="left|top"
+      <combo_box
+       name="hide_age"
+       tool_tip="Let people see your SL age"
        left="1"
-       top="25"
+       top="40"
        height="25"
-       width="140"
-       label="Actions"
-       halign="left"
-       image_unselected="DropDown_Off"
-       image_selected="DropDown_On"
-       image_pressed="DropDown_Press"
-       image_pressed_selected="DropDown_Press"
-       image_disabled="DropDown_Disabled"
-       name="agent_actions_menu" />
+       width="176"
+       follows="left|top"
+       layout="topleft"
+       enabled="false">
+        <combo_box.item
+           name="Show"
+           label="Show birthdate + SL age"
+           value="0"/>
+        <combo_box.item
+           name="Hide"
+           label="Show month + day only"
+           value="1"/>
+      </combo_box>
     </layout_panel>
   </layout_stack>
 
   <layout_stack
    name="main_stack"
    top="8"
-   left="168"
+   left="188"
    bottom="-1"
    right="-1"
    follows="all"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index faff6185ab..65dad8bca4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -286,13 +286,13 @@
                  name="Zoom"
                  value="Zoom" />
                 <combo_box.item
-                 label="Ignore object"
-                 name="Ignoreobject"
-                 value="Ignore" />
-                <combo_box.item
                  label="None"
                  name="None"
                  value="None" />
+                <combo_box.item
+                 label="Ignore object"
+                 name="Ignoreobject"
+                 value="Ignore" />
             </combo_box>
 	 <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 896120c6c0..c031b13c27 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3936,7 +3936,8 @@ Abuse Report</string>
   <string name="dance8">dance8</string>
 
   <!-- birth date format shared by avatar inspector and profile panels -->
-  <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
+  <string name="AvatarBirthDateFormatFull">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string>
+  <string name="AvatarBirthDateFormatShort">[mthnum,datetime,slt]/[day,datetime,slt]</string>
 
   <string name="DefaultMimeType">none/none</string>
   <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
@@ -4001,7 +4002,8 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <string name="EmptyOutfitText">There are no items in this outfit</string>
 
  <!-- External editor status codes -->
- <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.</string>
+ <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
+See https://wiki.secondlife.com/wiki/LSL_Alternate_Editors</string>
  <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
 Try enclosing path to the editor with double quotes.
 (e.g. "/path to my/editor" "%s")</string>