diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 18:45:22 +0000 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2012-06-15 18:45:22 +0000 |
| commit | 1ac0cd035da14679bf073ebe4231836ecf921aff (patch) | |
| tree | ae9fdab8f728e32caf52c82ee734dcec7670a935 /indra/newview/skins | |
| parent | 357c1f57b4db19b4500b09719e5f96c6a481c403 (diff) | |
| parent | 72a2538f74fb78d031a8e41c6ca2b8f22c75dac2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins')
| -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 |
