merge to latest viewer-development-havokai

4 files changed, 51 insertions, 25 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index a267902b94..c1f1f60c1b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -179,14 +179,24 @@
     <button
         follows="left|bottom"
         height="22"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        tool_tip="Enabled only when one character is selected."
+        top_pad="-22"
+        left_pad="26"
+        width="159"/>
+    <button
+        follows="right|bottom"
+        height="22"
         label="Return"
         layout="topleft"
         name="return_objects"
         top_pad="-22"
-        left_pad="6"
+        left_pad="26"
         width="94"/>
     <button
-        follows="left|bottom"
+        follows="right|bottom"
         height="22"
         label="Delete"
         layout="topleft"
@@ -194,15 +204,5 @@
         top_pad="-22"
         left_pad="6"
         width="94"/>
-    <button
-        follows="left|bottom"
-        height="22"
-        label="Teleport me to it"
-        layout="topleft"
-        name="teleport_me_to_object"
-        tool_tip="Enabled only when one character is selected."
-        top_pad="-22"
-        left_pad="6"
-        width="159"/>
   </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 3e718743dc..833e5489ba 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -322,14 +322,23 @@
     <button
         follows="left|bottom"
         height="21"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        top_pad="-21"
+        left_pad="206"
+        width="160"/>
+    <button
+        follows="right|bottom"
+        height="21"
         label="Return"
         layout="topleft"
         name="return_objects"
         top_pad="-21"
-        left_pad="6"
+        left_pad="220"
         width="95"/>
     <button
-        follows="left|bottom"
+        follows="right|bottom"
         height="21"
         label="Delete"
         layout="topleft"
@@ -337,15 +346,6 @@
         top_pad="-21"
         left_pad="6"
         width="95"/>
-    <button
-        follows="left|bottom"
-        height="21"
-        label="Teleport me to it"
-        layout="topleft"
-        name="teleport_me_to_object"
-        top_pad="-21"
-        left_pad="6"
-        width="160"/>
   </panel>
   <view_border
       bevel_style="none"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1682996c74..f9a4acb1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -967,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfinding" />
+              function="Tools.EnablePathfindingView" />
         </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 9b072f3bf8..b09fb7bbe8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7869,5 +7869,31 @@ Disabling future updates for this file.
 Attempted to add an invalid or unreadable image file [FNAME] which could not be opened or decoded.
 Attempt cancelled.
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingReturnMultipleItems"
+   type="alertmodal">
+    You are returning [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to return multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingDeleteMultipleItems"
+   type="alertmodal">
+    You are deleting [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to delete multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
 </notifications>