summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:09:05 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-27 15:09:05 +0200
commit15a92d2426598db539823a086c25442aeecd4839 (patch)
treea60be92996f6518e671fc2fa60b4a93818da422c /indra/newview/skins/default
parentd3d2a8d537bf1542c152afdb239f7021ebdbe78f (diff)
parent313e3c92c7f348e0c6856183955e2f34fefa1b0a (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_color_picker.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index fbecebc363..0daef29bc5 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -181,7 +181,7 @@
image_unselected="eye_button_inactive.tga"
layout="topleft"
left_pad="50"
- name="Pipette"
+ name="color_pipette"
width="28" />
<button
follows="right|bottom"