diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-11 18:05:06 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-11 18:05:06 -0700 |
| commit | ed99d0a0798280e38821663353ab8b38e9929f3d (patch) | |
| tree | de842cc04565dce6bdbe2543ee8fac91d814d1e2 /indra/newview/skins/default/xui | |
| parent | b5694ee3aab311423186a1e4eb7288b14ee57d61 (diff) | |
| parent | e05d70174ce269c1e525acfdccf6326eb4d5dd54 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f7e0206ab1..e6af4cf5a6 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> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> [APP_NAME] Update 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..a9cb5f83ed 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,15 @@ follows="right|top" image_name="Parcel_Health_Dark" /> + <pathfinding_dynamic_icon + name="pathfinding_dynamic_icon" + width="14" + height="13" + top="19" + left="2" + follows="right|top" + image_name="Pathfinding_Dynamic" + /> <!-- Default text color is invisible on top of nav bar background --> <damage_text name="damage_text" |