Merge remote-tracking branch 'Liru/master'

indra/newview/skins/default/xui/en-us/floater_object_backup.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
-     	rect_control="FloaterObjectBackuptRect"
-	height="80" width="200"	name="Import" title="Import progress" mouse_opaque="true">
-  <text height="30" left="10" name="name_label" top="-20"> Progress </text>  
+<floater name="Object Backup" title="Progress" rect_control="FloaterObjectBackuptRect"
+ can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
+	height="80" width="200"	mouse_opaque="true">
+  <text height="30" left="10" name="name_label" top="-20">
+    Progress
+  </text>
+  <string name="export">
+    Object export
+  </string>
+  <string name="import">
+    Object import
+  </string>
 </floater>

indra/newview/skins/default/xui/en-us/menu_radar.xml

@@ -119,6 +119,10 @@
       <on_check control="RadarAlertAge"/>
     </menu_item_check>
     <menu_item_separator/>
+    <menu_item_check label="Include distance in alerts" name="Include distance in alerts">
+      <on_click function="ToggleControl" userdata="RadarAlertShowDist"/>
+      <on_check control="RadarAlertShowDist"/>
+    </menu_item_check>
     <menu_item_check label="Announce even when closed" name="Announce even when closed">
       <on_click function="ToggleControl" userdata="RadarKeepOpen"/>
       <on_check control="RadarKeepOpen"/>

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -5938,11 +5938,25 @@ A login URI is required to retrieve the grid info.
 Builds with extended hollow or extended hole size do not render properly on other viewers. Please keep this option checked, if you want your builds looking properly in other viewers.
   </notification>
 
+<notification
+   icon="alertmodal.tga"
+   name="ImportFailed"
+   type="alertmodal">
+Bad XML file. Import aborted.
+</notification>
+
+<notification
+   icon="notifytip.tga"
+   name="ExportAborted"
+   type="notifytip">
+The Object was deselected before the export could occur. Export aborted.
+</notification>
+
   <notification
    icon="alertmodal.tga"
    name="ExportFailed"
    type="alertmodal">
-None of the selected objects are exportable. Export aborted.
+Bad permissions for the exported object. Export aborted.
   </notification>
 
   <notification
@@ -5959,6 +5973,23 @@ Object exported. Some textures could not be saved due to: [REASON]
 Export successful.
   </notification>
 
+<notification
+   icon="alertmodal.tga"
+   name="ConfirmAbortBackup"
+   type="alertmodal">
+Are you sure you want to abort the current object backup operation?
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+    </form>
+</notification>
+
   <notification
    icon="notifytip.tga"
    name="SystemMessageTip"