From 4cba2c4457609d426a5db0511776bf5db2014256 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sat, 12 Jul 2014 11:19:05 +0100
Subject: BUG-6659 On the Edit tab of the build menu, clicking the area in
 between the full bright checkbox and the materials drop down box opens the
 color picker.

---
 doc/contributions.txt                                      | 1 +
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7e8ab46b1a..0a1c673daf 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1358,6 +1358,7 @@ Whirly Fizzle
 	VWR-29543
 	MAINT-873
 	STORM-1930
+	BUG-6659
 Whoops Babii
 	VWR-631
 	VWR-1640
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 426c0c4915..cb6b2fafd8 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -36,8 +36,9 @@
             <color_swatch
              can_apply_immediately="true"
              follows="left|top"
-             height="45"
+             height="22"
              label=""
+             label_height="0"
              layout="topleft"
              left="10"
              name="colorswatch"
-- 
cgit v1.2.3