summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-06-02 14:47:33 -0700
committerRichard Linden <none@none>2010-06-02 14:47:33 -0700
commit85cf77522b93571131f1c1f0018f30c3170f33ed (patch)
tree9f417912b1acc24e89680fbdf9b52f99d628cc2e /indra/newview/skins
parent2d107f4349cfcc3fe2b59a0d95ee75ee50134205 (diff)
fixed merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/button.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index c4f0fe5208..2d0a1728d5 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -2,6 +2,7 @@
<!-- Additional attributes:
image_pressed
image_pressed_selected
+ image_flash
-->
<button image_unselected="PushButton_Off"
image_selected="PushButton_Selected"