summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-23 18:16:03 -0800
committerJames Cook <james@lindenlab.com>2009-11-23 18:16:03 -0800
commit6634d3c1ccbe13d3c0cdd17b60628eabe633ea7d (patch)
treeab6b994092906e0ddf0d377cc81f6f19d27baac2 /indra/newview/skins
parent2ede27a5e266794fc3d034f12344a580260a3546 (diff)
Add damage % text to nav bar, clip text entry to avoid overlapping icons
Fixed includes of llmenugl.h / llnotifications.h Note: Clipping is incorrect, I think due to line editor bug.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml12
1 files changed, 11 insertions, 1 deletions
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 1fed1c075a..17b1479ec4 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -81,8 +81,18 @@
top="21"
image_name="parcel_lght_Damage"
/>
+ <!-- Default text color is invisible on top of nav bar background -->
+ <damage_text
+ name="damage_text"
+ width="50"
+ height="18"
+ top="16"
+ halign="right"
+ font="SansSerifSmall"
+ text_color="TextFgColor"
+ />
- <combo_button name="Location History"
+ <combo_button name="Location History"
label=""
pad_right="0"/>
<combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"