summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-02-05 19:15:12 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2010-02-05 19:15:12 +0200
commit95147c4529f6effcd1ed0a1d427f8ddeb033670d (patch)
treea15109edf500f89263e04dfca5baf7abbdded716 /indra/newview/skins/default/xui
parenta46a029a70ead8e09810741abaf35c53adbd2763 (diff)
Implemented critical task (EXT-4703) Add maturity icons to the Viewer 2 toolbar.
- Added maturity icons to location bar. - Added getting font used in LLLineEditor. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml9
1 files changed, 9 insertions, 0 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 626135642b..1d61447e31 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -4,6 +4,8 @@
Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
-->
<location_input font="SansSerifSmall"
+ icon_maturity_general="Parcel_PG_Light"
+ icon_maturity_adult="Parcel_R_Light"
add_landmark_image_enabled="Favorite_Star_Active"
add_landmark_image_disabled="Favorite_Star_Off"
add_landmark_image_hover="Favorite_Star_Over"
@@ -41,6 +43,13 @@
scale_image="false"
top="19"
left="-3" />
+ <maturity_icon
+ name="maturity_icon"
+ width="18"
+ height="16"
+ top="20"
+ follows="left|top"
+ />
<for_sale_button
name="for_sale_btn"
image_unselected="Parcel_ForSale_Light"