summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-22 17:58:14 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-22 17:58:14 -0700
commit51fdc40d6f2c35dea90b3b6e6a6e1c1fd633854f (patch)
tree03924a9c8b39b716edafab2ba2b6a3efe0517b69 /indra/newview/skins/default/xui
parenta1b6719c580223662481399f986a3dde9a7b3e10 (diff)
PATH-767,PATH-779: Adding a notification for when the rebake button appears. Also, updating some tooltip copy.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml24
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
2 files changed, 23 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c250b7c634..b9f041ae3e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5793,7 +5793,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 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.
</notification>
<notification
@@ -5804,7 +5804,27 @@ This area has building disabled. You can&apos;t build or rez objects here.
<unique/>
Dynamic pathfinding is not enabled on this region. Scripted objects with pathfinding LSL calls may not operate as expected on this region.
</notification>
-
+
+ <notification
+ icon="alertmodal.tga"
+ 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.
+ <url
+ option="1"
+ name="url"
+ target = "_external">
+ http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+ </url>
+ <usetemplate
+ name="okhelpignore"
+ ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
+ yestext="OK"
+ helptext="Help"
+ />
+ </notification>
+
<notification
icon="notify.tga"
name="SeeAvatars"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4b396e24b1..a177054211 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,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">The pathfinding navmesh has pending changes.</string>
+ <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is cleaned up.</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">