summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2009-11-05 19:20:56 +0200
committerAndrew Dyukov <adyukov@productengine.com>2009-11-05 19:20:56 +0200
commitb6aef7ea394430ab29698a2a4f1a4d9d93faeff0 (patch)
treec86e0ed21dc1626c44d8975d8292309143d11e85
parentc8904ad1a35fb9c0d22423b47e2ddf9789877297 (diff)
Fixed EXT-1769 (Edit Pick: '+' icon blinks on mouse over), but new icon is needed.
--HG-- branch : product-engine
-rw-r--r--indra/newview/llpanelpick.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_pick.xml4
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 103f041686..f5c4f89702 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -413,6 +413,8 @@ BOOL LLPanelPickEdit::postBuild()
childSetAction(XML_BTN_SAVE, boost::bind(&LLPanelPickEdit::onClickSave, this));
childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelPickEdit::onClickSetLocation, this));
+ initTexturePickerMouseEvents();
+
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 282b3f3e55..f4a212ba0a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -64,9 +64,9 @@
top="20"
left="10"
name="pick_snapshot" />
- <button
+ <icon
height="18"
- image_overlay="AddItem_Off"
+ image_name="AddItem_Off"
layout="topleft"
right="-5"
name="edit_icon"