From edf5a3f8f6f8a0c6263e1b9e20553243412bad22 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 27 Jun 2012 14:22:08 -0700
Subject: Minor changes to pathfinding-specific wordings.

---
 .../newview/skins/default/xui/en/notifications.xml | 26 ++++++++++------------
 .../skins/default/xui/en/panel_navmesh_rebake.xml  | 12 +++++-----
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ea06e3a321..837637a54e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1533,9 +1533,7 @@ 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.
-
-Please move all objects to the same region, and then attempt to link the objects together again.
+    Objects cannot be linked across region boundaries.
     <tag>fail</tag>
   </notification>
 
@@ -5820,7 +5818,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    The pathfinding navmesh has pending changes and is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the “Clean up region” button.
+    The region has pending pathfinding changes.  If you have build rights, you may rebake the region by clicking on the “Rebake region” button.
   </notification>
 
   <notification
@@ -5829,7 +5827,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    Dynamic pathfinding is not enabled on this region.  Scripted objects with pathfinding LSL calls may not operate as expected on this region.
+    Dynamic pathfinding is not enabled on this region.  Scripted objects using pathfinding LSL calls may not operate as expected on this region.
   </notification>
 
   <notification
@@ -5837,7 +5835,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
    name="PathfindingRebakeNavmesh"
    type="alertmodal">
     <unique/>
-    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make such objects work again, click the “Clean up region” button.  Choose “Help” to read more information.
+    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make moving objects behave correctly, click the “Rebake region” button.  Choose “Help” for more information.
     <url
       option="1"
       name="url"
@@ -5857,7 +5855,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
    name="PathfindingCannotRebakeNavmesh"
    type="alertmodal">
     <unique/>
-    You are not allowed to rebake the navmesh at the current time.
+    An error occurred.  There may be a network or server problem, or you may not have build rights.  Sometimes logging out and back in will solve this problem.
     <usetemplate
      name="okbutton"
      yestext="OK"
@@ -7777,7 +7775,7 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
     Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7787,10 +7785,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    icon="alertmodal.tga"
    name="PathfindingLinksets_SetLinksetUseMismatchOnVolume"
    type="alertmodal">
-    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of the shape is non-convex.
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="Some selected linksets cannot be set because the shape is non-convex"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7801,10 +7799,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume"
    type="alertmodal">
     Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
- Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of the shape is non-convex. These linksets use types will not change.
+ Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex. These linksets&apos; use types will not change.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset and because the shape is non-convex."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7814,10 +7812,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    icon="alertmodal.tga"
    name="PathfindingLinksets_ChangeToFlexiblePath"
    type="alertmodal">
-    The selected object is marked as permanent and is included in the navmesh.  Setting the object to be a Flexible Path will unset the permanent value and remove the object from the navmesh.  Do you wish to proceed?
+    The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index ddfba4c43d..c9bbaa1a21 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -9,11 +9,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Clean up region"
+      label="Rebake region"
       layout="topleft"
       left="10"
       name="navmesh_btn"
-      tool_tip="Click here to rebake the region&apos;s navmesh."
+      tool_tip="Click to rebake the region&apos;s navmesh."
       top="2"
       visible="false"
       enabled="true"
@@ -21,11 +21,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Sending rebake request"
+      label="Requesting rebake"
       layout="topleft"
       left="10"
       name="navmesh_btn_sending"
-      tool_tip="Sending rebake request"
+      tool_tip="Sending rebake request to the server."
       top="2"
       visible="false"
       enabled="false"
@@ -33,11 +33,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Region is cleaning"
+      label="Region is rebaking"
       layout="topleft"
       left="10"
       name="navmesh_btn_baking"
-      tool_tip="Region is cleaning."
+      tool_tip="Region is being rebaked.  When completed, this button will disappear."
       top="2"
       visible="false"
       enabled="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 142103f03b..064cea5ae7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3326,7 +3326,7 @@ 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">Objects that move may not behave correctly in this region until the region is cleaned up.</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
   <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
-- 
cgit v1.2.3