merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3

* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262
* New Dev: EXT-1292 EXT-1139

15 files changed, 180 insertions, 88 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a233f7f0fa..0921ccfb95 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -62,7 +62,7 @@
        width="195"
        word_wrap="true">
       </text_editor>
-      <line_editor name="chat_editor" height="20" layout="topleft" width="190">
+      <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="190">
       </line_editor>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 65235da8d5..2790a12a36 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -50,6 +50,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_TurnLeft_On"
+         image_pressed_selected="Movement_TurnLeft_On"
          image_unselected="Movement_TurnLeft_Off"
          layout="topleft"
          left="17"
@@ -63,6 +64,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_TurnRight_On"
+         image_pressed_selected="Movement_TurnRight_On"
          image_unselected="Movement_TurnRight_Off"
          layout="topleft"
          left_pad="34"
@@ -76,6 +78,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_Up_On"
+         image_pressed_selected="Movement_Up_On"
          image_unselected="Movement_Up_Off"
          layout="topleft"
          left="10"
@@ -89,6 +92,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_Down_On"
+         image_pressed_selected="Movement_Down_On"
          image_unselected="Movement_Down_Off"
          layout="topleft"
          left_pad="45"
@@ -102,6 +106,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_Forward_On"
+         image_pressed_selected="Movement_Forward_On"
          image_unselected="Movement_Forward_Off"
          layout="topleft"
          left="46"
@@ -116,6 +121,7 @@
          follows="left|bottom"
          height="25"
          image_selected="Movement_Backward_On"
+         image_pressed_selected="Movement_Backward_On"
          image_unselected="Movement_Backward_Off"
          layout="topleft"
          left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index e98920f8c2..a7abb223ba 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -31,7 +31,7 @@
              parameter="ShowMoveButton" />
     </menu_item_check>
     <menu_item_check
-         label="Camera button"
+         label="View button"
          layout="topleft"
          name="ShowCameraButton">
            <menu_item_check.on_click
@@ -41,4 +41,15 @@
              function="CheckControl"
              parameter="ShowCameraButton" />
     </menu_item_check>        
+    <menu_item_check
+         label="Snapshot button"
+         layout="topleft"
+         name="ShowSnapshotButton">
+           <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="ShowSnapshotButton" />
+             <menu_item_check.on_check
+             function="CheckControl"
+             parameter="ShowSnapshotButton" />
+    </menu_item_check>        
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index 951cf63c76..92c9935721 100644
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@@ -55,6 +55,9 @@
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="paste" />
+        <menu_item_call.on_enable
+         function="Favorites.EnableSelected"
+         parameter="can_paste" />
     </menu_item_call>
 
     <menu_item_separator
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..6768d7fccb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ name="Teleport History Gear Context Menu"
+ left="0"
+ bottom="0"
+ visible="false"
+ mouse_opaque="false"
+ opaque="true"
+ color="MenuDefaultBgColor"
+ drop_shadow="true" >
+    <menu_item_call
+     label="Expand all folders"
+     name="Expand all folders">
+        <menu_item_call.on_click
+         function="TeleportHistory.ExpandAllFolders" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     name="Collapse all folders">
+        <menu_item_call.on_click
+         function="TeleportHistory.CollapseAllFolders" />
+    </menu_item_call>
+    <menu_item_separator layout="topleft" />
+    <menu_item_call
+     label="Clear Teleport History"
+     name="Clear Teleport History">
+        <menu_item_call.on_click
+         function="TeleportHistory.ClearTeleportHistory" />
+    </menu_item_call>    
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index d9cba27b88..515278c23d 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -23,11 +23,4 @@
         <menu_item_call.on_click
          function="TeleportHistory.Copy" />
     </menu_item_call>
-    <menu_item_call
-     label="Make Landmark"
-     layout="topleft"
-     name="Make Landmark">
-        <menu_item_call.on_click
-         function="TeleportHistory.MakeLandmark" />
-    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 466824a974..117fb226be 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6523,6 +6523,17 @@ Server Error: Media update or get failed.
          yestext="OK"/>
     </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearTeleportHistory"
+   type="alertmodal">
+Are you sure you want to delete teleport history?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
   </global>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index cd7e340ff1..72869a3197 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -105,10 +105,10 @@
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="150"
+         min_width="100"
          name="cam_panel"
          top_delta="-10"
-         width="150">
+         width="100">
             <button
              follows="right"
              height="20"
@@ -140,11 +140,24 @@
              	parameter="camera_presets"
              	/>
             </button>
+        </layout_panel>
+        <layout_panel
+         mouse_opaque="false"        
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="35"
+         name="snapshot_panel"
+         top_delta="-10"
+         width="35">         
             <split_button
              arrow_position="right"
              follows="right"
              height="18"
-             left_pad="4"
+             left="0"
+             layout="topleft"             
              name="snapshots"
              top="6"
              width="35">
@@ -160,19 +173,8 @@
                  image_unselected="camera_presets/camera_presets_snapshot.png"
                  name="snapshot"
                  tool_tip="Take Snapshot" />
-            </split_button>
+            </split_button>                  
         </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         name="DUMMY"
-         top="0"
-         width="5"/>
         <layout_panel
          mouse_opaque="false"
          follows="left|right"
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 b9a01d80f9..453e1319a6 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -2,13 +2,13 @@
 <panel
  background_visible="true"
  bevel_style="in"
- height="420"
+ height="570"
  label="Edit Pick"
  layout="topleft"
  left="0"
  name="panel_edit_pick"
  top="0"
- width="255">
+ width="333">
    <text
      type="string"
      length="1"
@@ -36,34 +36,26 @@
    <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="300"
+     height="470"
      layout="topleft"
-     left="0"
+     left="10"
+     top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="true"
      opaque="true"
-     width="255">
+     width="313">
     <panel
      name="scroll_content_panel"
      follows="left|top|right"
      layout="topleft"
      top="0"
      left="0"
-     width="240"
-     height="575">
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     width="220"
-     follows="left|right|top|bottom"
-     height="560"
-     layout="topleft"
-     left="0"
-     top="0">
+     width="298"
+     height="555">
     <texture_picker
      follows="left|top|right"
-     height="190"
-     width="220"
+     height="197"
+     width="280"
      layout="topleft"
      top="20"
      left="10"
@@ -101,7 +93,7 @@
          max_length="63"
          name="pick_name"
          text_color="black"
-         width="220" />
+         width="280" />
         <text
          type="string"
          length="1"
@@ -119,7 +111,8 @@
         <text_editor
          follows="left|top|right"
          height="100"
-         width="220"
+         width="280"
+         hide_scrollbar="false"
          layout="topleft"
          left="10"
          top_pad="2"
@@ -152,7 +145,7 @@
          right="-10"
          top_pad="2"
          text_color="white"
-         width="250"
+         width="280"
          word_wrap="true">
             loading...
         </text>
@@ -165,7 +158,6 @@
          name="set_to_curr_location_btn"
          width="200" />
     </panel>
-    </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 7db1b9e916..00ede1fb2c 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -80,7 +80,8 @@
      use_ellipses="true"
      value="MESSAGE"
      width="330"
-     word_wrap="true" />
+     word_wrap="true"
+     max_length="350" />
     <button
      follows="bottom"
      font="SansSerifBigBold"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 9edd14ce49..7d5ae3d78a 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -31,8 +31,8 @@
     <scroll_container
      color="DkGray2"
      opaque="true"
-     follows="left|top|bottom"
-     height="490"
+     follows="all"
+     height="470"
      layout="topleft"
      left="10"
      top_pad="10"
@@ -41,14 +41,14 @@
      width="313">
     <panel
      name="scroll_content_panel"
-     follows="left|top|right|bottom"
+     follows="left|top"
      min_height="300"
      layout="topleft"
      top="0"
      background_visible="false"
-     height="488"
+     height="470"
      left="0"
-     width="311">
+     width="295">
         <texture_picker
          enabled="false"
          follows="left|top"
@@ -57,11 +57,11 @@
          left="10"
          name="pick_snapshot"
          top="20"
-         width="290" />
+         width="280" />
         <text
          follows="left|top|right"
          height="20"
-         width="291"
+         width="280"
          layout="topleft"
          font="SansSerifBig"
          font.style="BOLD"
@@ -77,16 +77,16 @@
          layout="topleft"
          left="10"
          name="pick_location"
-         width="291"
+         width="280"
          word_wrap="true"
          value="[loading...]" />
         <text
          follows="left|top|right"
-         height="400"
+         height="280"
          layout="topleft"
          left="10"
          name="pick_desc"
-         width="290"
+         width="280"
          value="[description]"
          word_wrap="true" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 696e0b3c33..1761c80a39 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -60,7 +60,7 @@
          left="5"
          name="teleport_btn"
          top="0"
-         width="70" />
+         width="77" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 9cf699ad46..78aff64216 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -312,7 +312,7 @@
          name="teleport"
          left_pad="0"
          top="0"
-         width="75" />
+         width="77" />
     </panel>
     <panel
      follows="bottom|left"
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 aa95a2baef..b0cd75117f 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
      border="true" follows="left|top|right|bottom">     
+    <string
+     name="cant_create_lm_here"
+     value="Please teleport to selected location before creating Landmark. " />
+    <string
+     name="create_landmark"
+     value="Create Landmark" />
+    <string
+     name="open_landmark"
+     value="Open Landmark panel" />
     <accordion
      follows="left|top|right|bottom"
-     height="326"
+     height="300"
      layout="topleft"
      left="0"
      top="0"
      name="history_accordion"
      width="380">
-
-	<accordion_tab
+	    <accordion_tab
          can_resize="false"
          layout="topleft"
          name="today"
@@ -24,9 +32,8 @@
              name="today_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -41,9 +48,8 @@
              name="yesterday_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -58,9 +64,8 @@
              name="2_days_ago"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -75,9 +80,8 @@
              name="3_days_ago"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-     
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -92,9 +96,8 @@
              name="4_days_ago"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-     
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -109,9 +112,8 @@
              name="5_days_ago_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-          
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -126,9 +128,8 @@
              name="6_days_and_older_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -143,9 +144,8 @@
              name="1_month_and_older_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>     
-
+	        </flat_list_view>
+	    </accordion_tab>
         <accordion_tab
          can_resize="false"
          layout="topleft"
@@ -160,7 +160,47 @@
              name="6_months_and_older_items"
              top="0"
              width="380">
-	    </flat_list_view>
-	</accordion_tab>
+	        </flat_list_view>
+	    </accordion_tab>
     </accordion>
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     top_pad="0"
+     follows="left|right|bottom"
+     height="30"
+     label="bottom_panel"
+     layout="topleft"
+     left="0"
+     name="bottom_panel"
+     width="380">
+        <button
+         follows="bottom|left"
+         font="SansSerifBigBold"
+         tool_tip=""
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="gear_btn"
+         picture_style="true"
+         top="5"
+         width="18" />
+        <button
+         follows="bottom|left"
+         font="SansSerifBigBold"
+         height="18"
+         image_selected="Favorite_Star_Active"
+         image_disabled="Favorite_Star_Off"
+         image_unselected="Favorite_Star_Press"
+         layout="topleft"
+         left_pad="5"
+         name="star_btn"
+         picture_style="true"
+         tool_tip=""
+         top_delta="0"
+         width="18" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d124a4cdfa..44875e9a25 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2887,6 +2887,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="no_ability_error">
     You do not have that ability.
   </string>
+  <string name="no_ability">
+    You do not have that ability.
+  </string>
   <string name="not_a_mod_error">
     You are not a session moderator.
   </string>