summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-06-11 17:46:39 -0400
committerprep <prep@lindenlab.com>2012-06-11 17:46:39 -0400
commit2400b8a651e5aec599c2132d3cf9c12b78b21d83 (patch)
treeeb3b8d3c0d6b85fc0bdd0db91f87c35b8df011f1 /indra/newview/skins/default/xui
parent9252ad10fd28e98157137addde7df3ad883c9948 (diff)
WIP:path-703 Adding icon to slurl bar to indicate if dynamic pathfinding is enabled or disbled.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml9
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 84532c4c2b..15963af960 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"