merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

10 files changed, 210 insertions, 82 deletions

diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml
new file mode 100644
index 0000000000..94839a7593
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/accordion_drag.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel  border_thickness="2" visible ="true" name="splitter_drag"
+  width="100"
+  height="5"
+  left="50"
+  top="50"
+  follows="left|bottom|right" background_visible="true" label="splitter_drag" title="">
+</panel>
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..542e319792
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="IMChiclet Group Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="Chat..."
+     layout="topleft"
+     name="Chat">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="group chat" />
+    </menu_item_call>
+    <menu_item_call
+     label="Info..."
+     layout="topleft"
+     name="Show Profile">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="info" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..bad6e1e212
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="IMChiclet P2P Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="Show Profile..."
+     layout="topleft"
+     name="Show Profile">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Send IM..."
+     layout="topleft"
+     name="Send IM">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend..."
+     layout="topleft"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove Friend..."
+     layout="topleft"
+     name="Remove Friend">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="remove" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef6f2237ad..d890edcfed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3068,9 +3068,10 @@ Are you sure you want to teleport?
    type="alertmodal">
 Teleport to [PICK]?
     <usetemplate
-     name="okcancelbuttons"
+     ignoretext="When teleporting from double-clicking a pick"
+     name="okcancelignore"
      notext="Cancel"
-     yestext="OK"/>
+     yestext="Teleport"/>
   </notification>
   
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 6c4f47a34f..7006203dcd 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -11,10 +11,6 @@
  top="28"
  border_visible="true"
  width="1000">
-    <panel.string
-     name="gesture_label">
-        Gestures
-    </panel.string>
     <layout_stack
      border_size="0"
      follows="left|right|bottom|top"
@@ -53,7 +49,7 @@
              layout="topleft"
              left="0"
              name="chat_box"
-				     right="-39"
+             right="-39"
              top="3"
              width="250" />
             <button follows="right" width="36" top="3" left="214" resize="false"
@@ -131,7 +127,7 @@
          width="90"
          top="0"
          min_width="90">
-            <combo_box
+            <gesture_combo_box
              bottom="22"
              follows="right"
              height="20"
@@ -192,8 +188,8 @@
          min_height="28"
          top="0"
          name="chiclet_list_panel"
-         width="250"
-         min_width="100">
+         width="150"
+         min_width="70">
             <chiclet_panel
              follows="left|right"
              height="25"
@@ -201,7 +197,9 @@
              left="0"
              name="chiclet_list"
              top="1"
-             width="250" />
+             chiclet_padding="3"
+             scrolling_offset="40"
+             width="150" />
         </layout_panel>
         <icon
          auto_resize="false"
@@ -227,13 +225,19 @@
             <chiclet_notification
              follows="right"
              height="25"
-             image_selected="im_notifications.tga"
-             image_unselected="im_notifications.tga"
              layout="topleft"
              left="0"
              name="im_well"
              top="1"
-             width="40" >
+             width="40">
+              <button
+               image_selected="im_notifications.tga"
+               image_unselected="im_notifications.tga"/>
+              <unread_notifications
+               width="20"
+               height="20"
+               left="18"
+               top="23"/>
 			  <chiclet_notification.commit_callback
 				 function="Notification.Show"
 				 parameter="ClickUnimplemented" />
@@ -254,7 +258,7 @@
          auto_resize="false"
          bevel_style="in"
          follows="left|right"
-         height="30"
+         height="28"
          layout="topleft"
          left="270"
          name="well_separator"
@@ -284,13 +288,19 @@
             <chiclet_notification
              follows="right"
              height="25"
-             image_selected="bottom_tray_sys_notifications.tga"
-             image_unselected="bottom_tray_sys_notifications.tga"
              layout="topleft"
              left="0"
              name="sys_well"
              top="1"
-             width="48" >
+             width="48">
+              <button
+               image_selected="bottom_tray_sys_notifications.tga"
+               image_unselected="bottom_tray_sys_notifications.tga"/>
+              <unread_notifications
+               width="20"
+               height="20"
+               left="22"
+               top="23"/>
 			  <chiclet_notification.commit_callback
 				 function="Notification.Show"
 				 parameter="ClickUnimplemented" />
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index a017e7398e..9cc3a00696 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -77,6 +77,7 @@
          height="20"
          layout="topleft"
          left="10"
+         max_length="63"
          name="pick_name"
          right="-10"
          text_color="black"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 6a819d0ef4..686dc931d3 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -32,7 +32,8 @@
      name="picture_name"
      text_color="black"
      top="5"
-     width="170" />
+     use_ellipses="true"
+     width="170"/>
     <text
      follows="right"
      font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 2aa566543f..366c3ecf6c 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -12,6 +12,14 @@
  name="places panel"
  top="400"
  width="355">
+    <panel.string
+     name="landmarks_tab_title">
+        Landmarks
+    </panel.string>
+    <panel.string
+     name="teleport_history_tab_title">
+        Teleport History
+    </panel.string>
     <search_editor
      follows="left|top|right"
      height="16"
@@ -73,7 +81,7 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="true"
+     enabled="false"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index feba6a7d02..01052f4bbe 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -17,7 +17,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="people_accordion" 
       title="People" 
       collapsable="true" 
@@ -35,7 +35,7 @@
         label="People" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
@@ -48,7 +48,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="places_accordian" 
       title="Places" 
       collapsable="true" 
@@ -63,7 +63,7 @@
         label="Places" 
         border="true"
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>
   
   <sidetray_tab 
@@ -75,7 +75,7 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="me_accordion" 
       title="Me" 
       collapsable="false" 
@@ -90,7 +90,7 @@
         label="Me" 
         border="true"
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>
   
   <!--
@@ -103,7 +103,7 @@
     tab_title="Groups"
     description="Manage Groups."
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="group_accordion" 
       title="Group General"
       expanded="true"
@@ -119,12 +119,12 @@
         label="Group" 
         border="true"
       />
-    </collapsible_ctrl>
-     <collapsible_ctrl 
+    </accordionctrl_tab>
+     <accordionctrl_tab 
       name="groupland_accordion" 
       title="Group Land and Money"
       expanded="false"
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       header_visible="true"
@@ -136,12 +136,12 @@
         label="Group" 
         border="true"
       />
-    </collapsible_ctrl>
-     <collapsible_ctrl 
+    </accordionctrl_tab>
+     <accordionctrl_tab 
       name="groupnotices_accordion" 
       title="Group Notices"
       expanded="false"
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       header_visible="true"
@@ -153,12 +153,12 @@
         label="Group" 
         border="true"
       />
-    </collapsible_ctrl>
-     <collapsible_ctrl 
+    </accordionctrl_tab>
+     <accordionctrl_tab 
       name="grouproles_accordion" 
       title="Group Roles"
       expanded="false"
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       header_visible="true"
@@ -170,7 +170,7 @@
         label="Group" 
         border="true"
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>  
   
 
@@ -184,7 +184,7 @@
     tab_title="Previews"
     description="Previews."
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="floater_preview_animation" 
       title="Preview Animation" 
       collapsable="true"
@@ -202,8 +202,8 @@
         label="Preview_Animation" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_preview_gesture" 
       title="Preview Gesture" 
       collapsable="true"
@@ -221,8 +221,8 @@
         label="Preview_Gesture" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_preview_existing_landmark" 
       title="Preview Existing Landmark" 
       collapsable="true"
@@ -240,8 +240,8 @@
         label="Preview_Existing_Landmark" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_preview_sound" 
       title="Preview Sound" 
       collapsable="true"
@@ -259,8 +259,8 @@
         label="Preview_Sound" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_preview_url" 
       title="Preview URL" 
       collapsable="true"
@@ -278,8 +278,8 @@
         label="Preview_URL" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_URL_entry" 
       title="URL Entry" 
       collapsable="true"
@@ -297,7 +297,7 @@
         label="URL_entry" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>
 
   <sidetray_tab 	
@@ -310,7 +310,7 @@
     tab_title="Region"
     description="Region."
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="panel_region_covenant" 
       title="Region Covenant" 
       collapsable="true" 
@@ -328,8 +328,8 @@
         label="Panel_Region_Covenant" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="panel_region_debug" 
       title="Region Debug" 
       collapsable="true" 
@@ -347,8 +347,8 @@
         label="Panel_Region_Debug" 
         border="true" 
       />
-    </collapsible_ctrl>
-  <collapsible_ctrl 
+    </accordionctrl_tab>
+  <accordionctrl_tab 
       name="panel_region_estate" 
       title="Region Estate" 
       collapsable="true" 
@@ -366,8 +366,8 @@
         label="Panel_Region_Estate" 
         border="true" 
       />
-    </collapsible_ctrl>
-  <collapsible_ctrl 
+    </accordionctrl_tab>
+  <accordionctrl_tab 
       name="panel_region_general" 
       title="Region General" 
       collapsable="true" 
@@ -385,8 +385,8 @@
         label="Panel_Region_General" 
         border="true" 
       />
-    </collapsible_ctrl>
-  <collapsible_ctrl 
+    </accordionctrl_tab>
+  <accordionctrl_tab 
       name="panel_region_terrain" 
       title="Region Terrain" 
       collapsable="true" 
@@ -404,8 +404,8 @@
         label="Panel_Region_Terrain" 
         border="true" 
       />
-    </collapsible_ctrl>
-  <collapsible_ctrl 
+    </accordionctrl_tab>
+  <accordionctrl_tab 
       name="panel_region_texture" 
       title="Region Texture" 
       collapsable="true" 
@@ -423,8 +423,8 @@
         label="Panel_Region_Texture" 
         border="true" 
       />
-    </collapsible_ctrl>
-  <collapsible_ctrl 
+    </accordionctrl_tab>
+  <accordionctrl_tab 
       name="floater_region_info" 
       title="Region Info" 
       collapsable="true" 
@@ -442,7 +442,7 @@
         label="Floater_Region_Info" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
   </sidetray_tab>
  
   <sidetray_tab 	
@@ -455,7 +455,7 @@
     tab_title="Build"
     description="Build"
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="floater_tools" 
       title="Tools" 
       collapsable="true" 
@@ -473,8 +473,8 @@
         label="Tools" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_bulk_perms" 
       title="Bulk Perms" 
       collapsable="true" 
@@ -492,8 +492,8 @@
         label="Tools" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_build_options" 
       title="Build Options" 
       collapsable="true" 
@@ -511,7 +511,7 @@
         label="Tools" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
     
   </sidetray_tab>
 
@@ -525,7 +525,7 @@
     tab_title="Other Tools"
     description="Other Tools"
   >
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="floater_gesture" 
       title="Gestures" 
       collapsable="true" 
@@ -543,9 +543,9 @@
         label="Gesture" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
     
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="floater_buy_contents" 
       title="Buy Contents" 
       collapsable="true" 
@@ -563,8 +563,8 @@
         label="buy_contents" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_buy_object" 
       title="Buy Object" 
       collapsable="true" 
@@ -583,7 +583,7 @@
         border="true" 
       />
     </collapsible_ctrl>
-    <collapsible_ctrl 
+    <accordionctrl_tab 
       name="floater_inventory_view_finder" 
       title="Inventory View Finder" 
       collapsable="true" 
@@ -601,8 +601,8 @@
         label="view_finder" 
         border="true" 
       />
-    </collapsible_ctrl>
-    <collapsible_ctrl 
+    </accordionctrl_tab>
+    <accordionctrl_tab 
       name="floater_mute" 
       title="Mute" 
       collapsable="true" 
@@ -620,8 +620,8 @@
         label="mute" 
         border="true" 
       />
-    </collapsible_ctrl>
-     <collapsible_ctrl 
+    </accordionctrl_tab>
+     <accordionctrl_tab 
       name="floater_sell_land" 
       title="Sell Land" 
       collapsable="true" 
@@ -639,8 +639,8 @@
         label="sell_land" 
         border="true" 
       />
-    </collapsible_ctrl>
-     <collapsible_ctrl 
+    </accordionctrl_tab>
+     <accordionctrl_tab 
       name="floater_telehub" 
       title="Telehub" 
       collapsable="true" 
@@ -658,7 +658,7 @@
         label="telehub" 
         border="true" 
       />
-    </collapsible_ctrl>
+    </accordionctrl_tab>
     
   </sidetray_tab>
  --> 
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
new file mode 100644
index 0000000000..45b1e1eb9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<combo_box font="SansSerifSmall"
+           list_position="below"
+           max_chars="20"
+           follows="right|top">
+  <combo_box.combo_button name="Combobox Button"
+                          label=""
+                          hover_glow_amount="0.15"
+                          font="SansSerifSmall"
+                          scale_image="true"
+                          image_unselected="ComboButton_Off"
+                          image_selected="ComboButton_Selected"
+                          image_disabled="ComboButton_Disabled"
+                          image_disabled_selected="ComboButton_Disabled_Selected" />
+  <combo_box.drop_down_button name="Drop Down Button"
+                              label=""
+                              hover_glow_amount="0.15"
+                              font="SansSerifSmall"
+                              scale_image="true"
+                              pad_right="24"
+                              image_unselected="DropDown_Off"
+                              image_selected="DropDown_Selected"
+                              image_disabled="DropDown_Disabled"
+                              image_disabled_selected="DropDown_Disabled_Selected" />
+  <combo_box.combo_list bg_writeable_color="white" />
+  <combo_box.combo_editor name="Combo Text Entry"
+                          select_on_focus="true"
+                          font="SansSerifSmall" />
+</combo_box>