merge up to latest viewer-development-havokai

13 files changed, 92 insertions, 226 deletions

diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
new file mode 100644
index 0000000000..cfa12cb7cc
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
new file mode 100644
index 0000000000..0622141848
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d5d58235a4..b76f04d17f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -142,7 +142,6 @@ with the same filename but different name
   <texture name="Command_Outbox_Icon"       file_name="toolbar_icons/outbox.png"       preload="true" />
   <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
-  <texture name="Command_PF_Basic_Icon"     file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png"        preload="true" />
   <texture name="Command_PF_Linksets_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
@@ -433,6 +432,9 @@ with the same filename but different name
  <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
  <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
+  <texture name="Pathfinding_Dirty" file_name="icons/Pathfinding_Dirty.png" preload="false" />
+  <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" />
+
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
   <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
   <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
deleted file mode 100644
index 7af40bbff6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    open_positioning="cascading"
-    can_tear_off="false"
-    height="213"
-    layout="topleft"
-    name="floater_pathfinding_basic"
-    help_topic="floater_pathfinding_basic"
-    reuse_instance="false"
-    save_rect="false"
-    single_instance="true"
-    title="Basic pathfinding setup"
-    width="312">
-  <floater.string name="status_pathfinding_not_enabled">This region is not enabled for pathfinding.</floater.string>
-  <floater.string name="status_unable_to_change_state">Unable to change modes successfully.</floater.string>
-  <floater.string name="status_querying_state">Checking status ...</floater.string>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="15"
-      name="status_label"
-      top="8"
-      width="289">
-  </text>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="15"
-      name="unfreeze_label"
-      top_pad="4"
-      width="289">
-    Allow object / terrain changes:
-  </text>
-  <button
-      follows="left|top"
-      height="22"
-      label="Unfreeze"
-      layout="topleft"
-      name="enter_unfrozen_mode"
-      width="116"/>
-  <text
-      height="82"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      line_spacing.multiple="1.5"
-      left="15"
-      name="freeze_label"
-      top_pad="23"
-      width="289">
-    In unfrozen mode, you can move and make changes to objects and terrain.  When you are finished, click the Freeze button.  It may require a few minutes to process your changes.
-  </text>
-  <button
-      follows="left|top"
-      height="22"
-      label="Freeze"
-      layout="topleft"
-      name="enter_frozen_mode"
-      top_pad="0"
-      width="116"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 54d44be015..59b816b0e1 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,7 +9,7 @@
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding edit / test"
+    title="Pathfinding debug"
     width="456">
   <floater.string name="navmesh_viewer_status_unknown"></floater.string>
   <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
@@ -21,7 +21,6 @@
   <floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string>
   <floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string>
   <floater.string name="navmesh_simulator_status_unknown"></floater.string>
-  <floater.string name="navmesh_simulator_status_region_not_enabled">This region does not expose the navmesh status.</floater.string>
   <floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string>
   <floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string>
   <floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string>
@@ -238,96 +237,9 @@
         bevel_style="none"
         follows="left|top"
         layout="topleft"
-        name="edit_panel"
-        left="1"
-        label="Edit">
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          name="unfreeze_label"
-          left="16"
-          top_pad="16"
-          height="13"
-          width="190">
-        Allow object / terrain changes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Unfreeze"
-          layout="topleft"
-          name="enter_unfrozen_mode"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          left="16"
-          name="edit_linksets_label"
-          top_pad="23"
-          height="13"
-          width="190">
-        Edit linkset attributes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          label="Linksets..."
-          layout="topleft"
-          name="view_and_edit_linksets"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          left="16"
-          line_spacing.multiple="1.5"
-          name="freeze_label"
-          top_pad="23"
-          height="32"
-          width="190">
-        Prevent object / terrain changes and update the navmesh:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Freeze"
-          layout="topleft"
-          name="enter_frozen_mode"
-          top_pad="3"
-          width="116"/>
-    </panel>
-    <panel
-        border="false"
-        bevel_style="none"
-        follows="left|top"
-        layout="topleft"
         left="1"
         name="test_panel"
-        label="Test">
+        label="Test path">
       <text
           height="14"
           word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 263e10aa1f..c881bb9d81 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -878,11 +878,11 @@
             </panel.string>
             <panel.string
              name="text modify info 5">
-                You can't modify this object in frozen mode
+                You can't modify this object across a region boundary
             </panel.string>
             <panel.string
              name="text modify info 6">
-                You can't modify these objects in frozen mode
+                You can't modify these objects across a region boundary
             </panel.string>
             <panel.string
              name="text modify warning">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ad02beff7a..ecc96ab402 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -943,31 +943,13 @@
          name="Pathfinding"
          tear_off="false">
         <menu_item_call
-            label="Basic setup..."
-            name="pathfinding_basic_menu_item">
-          <menu_item_call.on_click
-              function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_basic" />
-          <menu_item_call.on_enable
-              function="Tools.EnablePathfinding" />
-        </menu_item_call>
-        <menu_item_call
-            label="Edit / test..."
-            name="pathfinding_console_menu_item">
-          <menu_item_call.on_click
-              function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_console" />
-          <menu_item_call.on_enable
-              function="Tools.EnablePathfinding" />
-        </menu_item_call>
-        <menu_item_call
             label="Linksets..."
             name="pathfinding_linksets_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfindingLinksets" />
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
@@ -978,6 +960,15 @@
           <menu_item_call.on_enable
               function="Tools.EnablePathfinding" />
         </menu_item_call>
+        <menu_item_call
+            label="Pathfinding debug..."
+            name="pathfinding_console_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_console" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingDebug" />
+        </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 38e041fa20..b7e336e095 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1300,33 +1300,6 @@ The region [REGION] does not allow terraforming.
 
   <notification
    icon="alertmodal.tga"
-   name="RegionNoTerraformingWhileFrozen"
-   type="alertmodal">
-    You cannot terraform land while in Frozen mode.  Please switch to Unfrozen mode from the menu option Build->Pathfinding->Basic Setup.
-    <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AutomaticAgentStateUnfreeze"
-   type="alertmodal">
-You have automatically switched into Unfrozen mode because of one of the following reasons:
-
-- You rezzed an object marked as permanent
-- You returned an object marked as permanent
-
-After you finish modifying your permanent objects, please remember to switch back to Frozen mode  from the menu option Build->Pathfinding->Basic Setup.
-    <tag>confirm</tag>
-    <usetemplate
-      name="okhelpignore"
-      yestext="OK"
-      helptext="More Info"
-      ignoretext="Launch browser to view pathfinding help"
-      />
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="CannotCopyWarning"
    type="alertmodal">
 You do not have permission to copy the following items:
@@ -1533,9 +1506,9 @@ Please make sure none are locked, and that you own all of them.
    icon="alertmodal.tga"
    name="CannotLinkPermanent"
    type="alertmodal">
-Unable to link permanent objects in frozen mode.
+Unable to link permanent objects.
 
-Please switch to unfrozen mode from the menu option Build->Pathfinding->Basic Setup.
+Please move all objects to the same region, and then attempt to link the objects together again.
     <tag>fail</tag>
   </notification>
 
@@ -5815,6 +5788,24 @@ This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
   <notification
+     icon="notify.tga"
+     name="PathfindingDirty"
+     persist="true"
+     type="notify">
+    <unique/>
+    The pathfinding navmesh is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the Rebake Region button.
+  </notification>
+
+  <notification
+     icon="notify.tga"
+     name="DynamicPathfindingDisabled"
+     persist="true"
+     type="notify">
+    <unique/>
+    Dynamic pathfinding is not enabled on this region.
+  </notification>
+  
+  <notification
    icon="notify.tga"
    name="SeeAvatars"
    persist="true"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..94ca00945b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_navmesh_rebake"
+ mouse_opaque="false"
+ visible="true"
+ width="133">
+    <button
+     follows="left|bottom"
+     height="19"
+     label="Rebake NavMesh"
+     layout="topleft"
+     left="10"
+     name="navmesh_btn"
+     tool_tip="Click here to rebake."
+     top="2"
+     visible="false"
+     width="113" />
+  <button
+   follows="left|bottom"
+   height="19"
+   label="NavMesh Baking..."
+   layout="topleft"
+   left="10"
+   name="navmesh_btn_baking"
+   tool_tip="NavMesh is baking"
+   top="2"
+   visible="false"
+   width="113" />
+</panel>
+
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 58911bed56..107683f1f0 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -97,7 +97,7 @@
                visible="false"
                width="200"/>
       </layout_panel>
-      <layout_panel name="right_toolbar_panel"
+       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     height="500"
                     width="30"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 8a823e8278..dbf44d8767 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -32,11 +32,11 @@
             </panel.string>
             <panel.string
              name="text modify info 5">
-                You can't modify this object in frozen mode
+                You can't modify this object across a region boundary
             </panel.string>
             <panel.string
              name="text modify info 6">
-                You can't modify these objects in frozen mode
+                You can't modify these objects across a region boundary
             </panel.string>
             <panel.string
              name="text modify warning">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 84532c4c2b..4fdbe557b9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-
+  <string name="LocationCtrlPathfindingDirtyTooltip">The pathfinding navmesh is not up-to-date.</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not disabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
@@ -3832,7 +3833,6 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Outbox_Label">Merchant outbox</string>
   <string name="Command_Pathfinding_Label">Pathfinding</string>
   <string name="Command_People_Label">People</string>
-  <string name="Command_PF_Basic_Label">Pathfinding Basic</string>
   <string name="Command_PF_Characters_Label">Pathfinding Characters</string>
   <string name="Command_PF_Linksets_Label">Pathfinding Linksets</string>
   <string name="Command_Picks_Label">Picks</string>
@@ -3862,7 +3862,6 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
   <string name="Command_Pathfinding_Tooltip">Information about pathfinding</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
-  <string name="Command_PF_Basic_Tooltip">Manipulation of pathfinding frozen/unfrozen state</string>
   <string name="Command_PF_Characters_Tooltip">Manipulation of pathfinding characters</string>
   <string name="Command_PF_Linksets_Tooltip">Manipulation of pathfinding linksets</string>
   <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 44436fb6f2..0eec895b04 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -112,6 +112,24 @@
     follows="right|top"
     image_name="Parcel_Health_Dark"
     />
+  <pathfinding_dirty_icon
+    name="pathfinding_dirty_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Pathfinding_Dirty"
+    />
+  <pathfinding_disabled_icon
+    name="pathfinding_disabled_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Pathfinding_Disabled"
+    />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
     name="damage_text"