First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated.

3 files changed, 57 insertions, 34 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a39e1a0511..9bf2922033 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -104,6 +104,15 @@
   <color
       name="LtGreen"
       value="0.2 1 0.2 1" />
+  <color
+      name="Red_80"
+      value="1 0 0 0.8" />
+  <color
+      name="Green_80"
+      value="0 1 0 0.8" />
+  <color
+      name="Blue_80"
+      value="0 0 1 0.8" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
        Leave this here until all Unused? are removed below, otherwise
@@ -636,6 +645,18 @@
       name="PathfindingGoodColor"
       reference="LtGreen" />
   <color
+      name="PathfindingDefaultBeaconColor"
+      reference="Red_80" />
+  <color
+      name="PathfindingDefaultBeaconTextColor"
+      reference="White" />
+  <color
+      name="PathfindingLinksetBeaconColor"
+      reference="Blue_80" />
+  <color
+      name="PathfindingCharacterBeaconColor"
+      reference="Red_80" />
+  <color
       name="PieMenuBgColor"
       value="0.24 0.24 0.24 0.59" />
   <color
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 16b4a70b93..a81c4cb891 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -14,12 +14,14 @@
     save_rect="false"
     single_instance="true"
     title="Pathfinding characters">
-  <floater.string name="characters_messaging_initial"></floater.string>
-  <floater.string name="characters_messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
-  <floater.string name="characters_messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
-  <floater.string name="characters_messaging_complete_none_found">No pathfinding characters.</floater.string>
-  <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
-  <floater.string name="characters_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
+  <floater.string name="messaging_set_inprogress"></floater.string>
+  <floater.string name="messaging_set_error"></floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding characters.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
   <panel
       border="false"
@@ -38,7 +40,7 @@
         top_pad="10"
         tab_stop="false"
         multi_select="true"
-        name="pathfinding_characters"
+        name="objects_scroll_list"
         width="600">
       <scroll_list.columns
           label="Name"
@@ -70,7 +72,7 @@
         length="1"
         follows="left|bottom|right"
         layout="topleft"
-        name="characters_status"
+        name="messaging_status"
         top_pad="17"
         width="238">
       Characters:
@@ -80,7 +82,7 @@
         height="21"
         label="Refresh list"
         layout="topleft"
-        name="refresh_characters_list"
+        name="refresh_objects_list"
         top_pad="-29"
         left_pad="0"
         width="115"/>
@@ -89,7 +91,7 @@
         height="21"
         label="Select all"
         layout="topleft"
-        name="select_all_characters"
+        name="select_all_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -98,7 +100,7 @@
         height="21"
         label="Select none"
         layout="topleft"
-        name="select_none_characters"
+        name="select_none_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -150,7 +152,7 @@
         height="22"
         label="Take"
         layout="topleft"
-        name="take_characters"
+        name="take_objects"
         top_pad="9"
         left="18"
         width="94"/>
@@ -159,7 +161,7 @@
         height="22"
         label="Take copy"
         layout="topleft"
-        name="take_copy_characters"
+        name="take_copy_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -168,7 +170,7 @@
         height="22"
         label="Return"
         layout="topleft"
-        name="return_characters"
+        name="return_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -177,7 +179,7 @@
         height="22"
         label="Delete"
         layout="topleft"
-        name="delete_characters"
+        name="delete_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -186,7 +188,7 @@
         height="22"
         label="Teleport me to it"
         layout="topleft"
-        name="teleport_to_character"
+        name="teleport_me_to_object"
         tool_tip="Enabled only when one character is selected."
         top_pad="-22"
         left_pad="6"
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 b4e367690c..3ae5301cc2 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -14,14 +14,14 @@
     save_rect="false"
     single_instance="true"
     title="Pathfinding linksets">
-  <floater.string name="linksets_messaging_initial"></floater.string>
-  <floater.string name="linksets_messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
-  <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
+  <floater.string name="messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
   <floater.string name="linkset_terrain_description">--</floater.string>
   <floater.string name="linkset_terrain_owner">--</floater.string>
@@ -174,7 +174,7 @@
         top_pad="15"
         tab_stop="false"
         multi_select="true"
-        name="pathfinding_linksets"
+        name="objects_scroll_list"
         width="980">
       <scroll_list.columns
           label="Name (root prim)"
@@ -226,7 +226,7 @@
         length="1"
         follows="left|bottom|right"
         layout="topleft"
-        name="linksets_status"
+        name="messaging_status"
         top_pad="17"
         width="619">
       Linksets:
@@ -236,7 +236,7 @@
         height="21"
         label="Refresh list"
         layout="topleft"
-        name="refresh_linksets_list"
+        name="refresh_objects_list"
         top_pad="-16"
         left_pad="0"
         width="115"/>
@@ -245,7 +245,7 @@
         height="21"
         label="Select all"
         layout="topleft"
-        name="select_all_linksets"
+        name="select_all_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -254,7 +254,7 @@
         height="21"
         label="Select none"
         layout="topleft"
-        name="select_none_linksets"
+        name="select_none_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -305,7 +305,7 @@
         height="21"
         label="Take"
         layout="topleft"
-        name="take_linksets"
+        name="take_objects"
         top_pad="9"
         left="18"
         width="95"/>
@@ -314,7 +314,7 @@
         height="21"
         label="Take copy"
         layout="topleft"
-        name="take_copy_linksets"
+        name="take_copy_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -323,7 +323,7 @@
         height="21"
         label="Return"
         layout="topleft"
-        name="return_linksets"
+        name="return_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -332,7 +332,7 @@
         height="21"
         label="Delete"
         layout="topleft"
-        name="delete_linksets"
+        name="delete_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -341,7 +341,7 @@
         height="21"
         label="Teleport me to it"
         layout="topleft"
-        name="teleport_me_to_linkset"
+        name="teleport_me_to_object"
         top_pad="-21"
         left_pad="6"
         width="160"/>