diff options
author | James Cook <james@lindenlab.com> | 2009-11-23 14:23:51 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-23 14:23:51 -0800 |
commit | 347562844dc2be598f39138a39eaacaff6b4e323 (patch) | |
tree | 1e3a084cdbd86efa3c757311cd500c4dca0e28de /indra/newview/skins/default/xui | |
parent | 83237f875cb26d9f72055a5d47cdb928b30c0dc6 (diff) |
Initial implementation of parcel property icons and maturity string on nav bar
Added new LLAgentUI location format, renamed unclear old one
Renamed ShowCoordinatesOption to NavBarShowCoordinates
Extended LLLocationInputCtrl to show icons.
Reviewed with Rick
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 48 |
1 files changed, 46 insertions, 2 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 d88bcfab1d..1fed1c075a 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -11,7 +11,7 @@ add_landmark_image_disabled="Favorite_Star_Off" add_landmark_image_hover="Favorite_Star_Over" add_landmark_image_selected="Favorite_Star_Press" - add_landmark_hpad="2" + icon_hpad="2" allow_text_entry="true" list_position="below" show_text_as_tentative="false" @@ -38,7 +38,51 @@ scale_image="false" top="19" left="-3" /> - <combo_button name="Location History" + <voice_icon + name="voice_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_VoiceNo" + /> + <fly_icon + name="fly_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_FlyNo" + /> + <push_icon + name="push_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_PushNo" + /> + <build_icon + name="build_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_BuildNo" + /> + <scripts_icon + name="scripts_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_ScriptsNo" + /> + <!-- NOTE: Placeholder icon, there is no dark grayscale version --> + <damage_icon + name="damage_icon" + width="22" + height="18" + top="21" + image_name="parcel_lght_Damage" + /> + + <combo_button name="Location History" label="" pad_right="0"/> <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" |