diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/skins/default/xui/en/widgets | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/slider_bar.xml | 1 |
2 files changed, 1 insertions, 5 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 efb9a89c6a..eb9bb99b20 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -10,16 +10,13 @@ add_landmark_image_enabled="Favorite_Star_Active" add_landmark_image_disabled="Favorite_Star_Off" hover_glow_amount="0.15" - add_landmark_width="20" - add_landmark_height="20" add_landmark_hpad="2" allow_text_entry="true" - arrow_image="Combobox_Selected" list_position="below" show_text_as_tentative="false" max_chars="20" follows="left|top" - background="TextField_Off"> + > <info_button name="Place Information" label="" tool_tip="About current location" diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml index 7004de8475..b33acf81cc 100644 --- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml +++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml @@ -3,6 +3,5 @@ thumb_outline_color="SliderThumbOutlineColor" thumb_center_color="SliderThumbCenterColor" thumb_image="SliderThumb_Off" - hover_glow_amount="0.15" track_image="SliderTrack_Horiz" track_highlight_image="SliderTrack_Horiz" /> |