merge.

1 files changed, 21 insertions, 20 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f1aa5c27c1..5630dfbe8f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -70,7 +70,7 @@
      height="20"
      image_disabled="Tool_Zoom"
      image_disabled_selected="Tool_Zoom"
-     image_selected="Tool_Zoom"
+     image_selected="Tool_Zoom_Selected"
      image_unselected="Tool_Zoom"
      layout="topleft"
      left="10"
@@ -86,7 +86,7 @@
      height="20"
      image_disabled="Tool_Grab"
      image_disabled_selected="Tool_Grab"
-     image_selected="Tool_Grab"
+     image_selected="Tool_Grab_Selected"
      image_unselected="Tool_Grab"
      layout="topleft"
      left_pad="20"
@@ -102,7 +102,7 @@
      height="20"
      image_disabled="Tool_Face"
      image_disabled_selected="Tool_Face"
-     image_selected="Tool_Face"
+     image_selected="Tool_Face_Selected"
      image_unselected="Tool_Face"
      layout="topleft"
      left_pad="20"
@@ -118,7 +118,7 @@
      height="20"
      image_disabled="Tool_Create"
      image_disabled_selected="Tool_Create"
-     image_selected="Tool_Create"
+     image_selected="Tool_Create_Selected"
      image_unselected="Tool_Create"
      layout="topleft"
      left_pad="20"
@@ -134,7 +134,7 @@
      height="20"
      image_disabled="Tool_Dozer"
      image_disabled_selected="Tool_Dozer"
-     image_selected="Tool_Dozer"
+     image_selected="Tool_Dozer_Selected"
      image_unselected="Tool_Dozer"
      layout="topleft"
      left_pad="20"
@@ -344,7 +344,7 @@
      height="20"
      image_disabled="Object_Cube"
      image_disabled_selected="Object_Cube"
-     image_selected="Object_Cube"
+     image_selected="Object_Cube_Selected"
      image_unselected="Object_Cube"
      layout="topleft"
      left="4"
@@ -357,7 +357,7 @@
      height="20"
      image_disabled="Object_Prism"
      image_disabled_selected="Object_Prism"
-     image_selected="Object_Prism"
+     image_selected="Object_Prism_Selected"
      image_unselected="Object_Prism"
      layout="topleft"
      left_delta="26"
@@ -370,7 +370,7 @@
      height="20"
      image_disabled="Object_Pyramid"
      image_disabled_selected="Object_Pyramid"
-     image_selected="Object_Pyramid"
+     image_selected="Object_Pyramid_Selected"
      image_unselected="Object_Pyramid"
      layout="topleft"
      left_delta="26"
@@ -383,7 +383,7 @@
      height="20"
      image_disabled="Object_Tetrahedron"
      image_disabled_selected="Object_Tetrahedron"
-     image_selected="Object_Tetrahedron"
+     image_selected="Object_Tetrahedron_Selected"
      image_unselected="Object_Tetrahedron"
      layout="topleft"
      left_delta="26"
@@ -396,7 +396,7 @@
      height="20"
      image_disabled="Object_Cylinder"
      image_disabled_selected="Object_Cylinder"
-     image_selected="Object_Cylinder"
+     image_selected="Object_Cylinder_Selected"
      image_unselected="Object_Cylinder"
      layout="topleft"
      left_delta="26"
@@ -409,7 +409,7 @@
      height="20"
      image_disabled="Object_Hemi_Cylinder"
      image_disabled_selected="Object_Hemi_Cylinder"
-     image_selected="Object_Hemi_Cylinder"
+     image_selected="Object_Hemi_Cylinder_Selected"
      image_unselected="Object_Hemi_Cylinder"
      layout="topleft"
      left_delta="26"
@@ -422,7 +422,7 @@
      height="20"
      image_disabled="Object_Cone"
      image_disabled_selected="Object_Cone"
-     image_selected="Object_Cone"
+     image_selected="Object_Cone_Selected"
      image_unselected="Object_Cone"
      layout="topleft"
      left_delta="26"
@@ -435,7 +435,7 @@
      height="20"
      image_disabled="Object_Hemi_Cone"
      image_disabled_selected="Object_Hemi_Cone"
-     image_selected="Object_Hemi_Cone"
+     image_selected="Object_Hemi_Cone_Selected"
      image_unselected="Object_Hemi_Cone"
      layout="topleft"
      left_delta="26"
@@ -448,7 +448,7 @@
      height="20"
      image_disabled="Object_Sphere"
      image_disabled_selected="Object_Sphere"
-     image_selected="Object_Sphere"
+     image_selected="Object_Sphere_Selected"
      image_unselected="Object_Sphere"
      layout="topleft"
      left_delta="26"
@@ -461,7 +461,7 @@
      height="20"
      image_disabled="Object_Hemi_Sphere"
      image_disabled_selected="Object_Hemi_Sphere"
-     image_selected="Object_Hemi_Sphere"
+     image_selected="Object_Hemi_Sphere_Selected"
      image_unselected="Object_Hemi_Sphere"
      layout="topleft"
      left_delta="26"
@@ -474,7 +474,7 @@
      height="20"
      image_disabled="Object_Torus"
      image_disabled_selected="Object_Torus"
-     image_selected="Object_Torus"
+     image_selected="Object_Torus_Selected"
      image_unselected="Object_Torus"
      layout="topleft"
      left="4"
@@ -487,7 +487,7 @@
      height="20"
      image_disabled="Object_Tube"
      image_disabled_selected="Object_Tube"
-     image_selected="Object_Tube"
+     image_selected="Object_Tube_Selected"
      image_unselected="Object_Tube"
      layout="topleft"
      left_delta="26"
@@ -500,7 +500,7 @@
      height="20"
      image_disabled="Object_Ring"
      image_disabled_selected="Object_Ring"
-     image_selected="Object_Ring"
+     image_selected="Object_Ring_Selected"
      image_unselected="Object_Ring"
      layout="topleft"
      left_delta="26"
@@ -513,7 +513,7 @@
      height="20"
      image_disabled="Object_Tree"
      image_disabled_selected="Object_Tree"
-     image_selected="Object_Tree"
+     image_selected="Object_Tree_Selected"
      image_unselected="Object_Tree"
      layout="topleft"
      left_delta="26"
@@ -526,8 +526,9 @@
      height="20"
      image_disabled="Object_Grass"
      image_disabled_selected="Object_Grass"
-     image_selected="Object_Grass"
+     image_selected="Object_Grass_Selected"
      image_unselected="Object_Grass"
+     image_overlay_color="Red"
      layout="topleft"
      left_delta="26"
      name="ToolGrass"