diff options
| author | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
| commit | 329b98528ea4fdd34baaa225e4aa46ea8ad5bfe1 (patch) | |
| tree | 1e4d8488913eec8eebbc6ab4579ad405d3124c20 /indra/newview/skins/default | |
| parent | 583855f3e6ba45915c0031396ed90054a18c4c4d (diff) | |
| parent | 501127e4649cf6cdb8e1c31d66d8d24e20fe0631 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png | bin | 683 -> 384 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png Binary files differindex 2c485aef0d..0622141848 100644 --- a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e9151c2db9..ac36736a51 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5786,7 +5786,7 @@ This area has building disabled. You can't build or rez objects here. persist="true" type="notify"> <unique/> - Dynamic pathing is enabled. + Dynamic pathing is not available. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e6af4cf5a6..8771d83aa4 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="PathfindingDynamicTooltip">Dynamic Pathfinding Enabled</string> + <string name="PathfindingDynamicTooltip">Dynamic Pathfinding is not available</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> [APP_NAME] Update |
