diff options
| author | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-02 14:46:18 -0700 |
| commit | 2d107f4349cfcc3fe2b59a0d95ee75ee50134205 (patch) | |
| tree | f155e3d39d220443b389f65c29e0c909373102d1 /indra/newview/skins/default/xui/en/widgets | |
| parent | c1aaca36aefff1154a2cd0069d46d466ce39b83a (diff) | |
| parent | 141ea0f89628c92959c21b949fd2ff7a9cb50d9f (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/button.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text.xml | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 2d0a1728d5..c4f0fe5208 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -2,7 +2,6 @@ <!-- Additional attributes: image_pressed image_pressed_selected - image_flash --> <button image_unselected="PushButton_Off" image_selected="PushButton_Selected" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 998ec5b170..3006df22b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -6,7 +6,6 @@ font_shadow="none" tab_stop="false" halign="left" - hover_color="LabelSelectedColor" h_pad="0" allow_scroll="false" text_readonly_color="LabelDisabledColor" @@ -14,7 +13,6 @@ use_ellipses="false" bg_visible="false" border_visible="false" - hover="false" sound_flags="0" text_color="LabelTextColor" v_pad="0" |