From 353ed64274b09b60d8b055a9d9cbd78927adcc6b Mon Sep 17 00:00:00 2001 From: Chuck Linden Date: Tue, 2 Feb 2010 12:04:42 -0500 Subject: Created new graphics for build tools "selected" states. http://jira.secondlife.com/browse/EXT-4357 --- .../textures/build/Object_Cone_Selected.png | Bin 0 -> 576 bytes .../textures/build/Object_Cube_Selected.png | Bin 0 -> 477 bytes .../textures/build/Object_Cylinder_Selected.png | Bin 0 -> 443 bytes .../textures/build/Object_Grass_Selected.png | Bin 0 -> 757 bytes .../textures/build/Object_Hemi_Cone_Selected.png | Bin 0 -> 531 bytes .../build/Object_Hemi_Cylinder_Selected.png | Bin 0 -> 463 bytes .../textures/build/Object_Hemi_Sphere_Selected.png | Bin 0 -> 696 bytes .../textures/build/Object_Prism_Selected.png | Bin 0 -> 485 bytes .../textures/build/Object_Pyramid_Selected.png | Bin 0 -> 594 bytes .../textures/build/Object_Ring_Selected.png | Bin 0 -> 738 bytes .../textures/build/Object_Sphere_Selected.png | Bin 0 -> 1003 bytes .../textures/build/Object_Tetrahedron_Selected.png | Bin 0 -> 558 bytes .../textures/build/Object_Torus_Selected.png | Bin 0 -> 825 bytes .../textures/build/Object_Tree_Selected.png | Bin 0 -> 839 bytes .../textures/build/Object_Tube_Selected.png | Bin 0 -> 552 bytes indra/newview/skins/default/textures/textures.xml | 20 ++++++++++ .../newview/skins/default/xui/en/floater_tools.xml | 41 +++++++++++---------- 17 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 indra/newview/skins/default/textures/build/Object_Cone_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Cube_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Grass_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Prism_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Ring_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Sphere_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Torus_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Tree_Selected.png create mode 100644 indra/newview/skins/default/textures/build/Object_Tube_Selected.png (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png new file mode 100644 index 0000000000..d50dc69ffe Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png new file mode 100644 index 0000000000..3d6964530d Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png new file mode 100644 index 0000000000..3ed0389961 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png new file mode 100644 index 0000000000..3ebd5ea7a1 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png new file mode 100644 index 0000000000..3bdc4d1fd5 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png new file mode 100644 index 0000000000..0912442e29 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png new file mode 100644 index 0000000000..33db4a2de8 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png new file mode 100644 index 0000000000..9e80fe2b84 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png new file mode 100644 index 0000000000..d36bfa55d4 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png new file mode 100644 index 0000000000..962f6efb93 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png new file mode 100644 index 0000000000..715d597144 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png new file mode 100644 index 0000000000..b2ea680f23 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png new file mode 100644 index 0000000000..1fc22686eb Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png new file mode 100644 index 0000000000..5bd87f8a2f Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png differ diff --git a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png new file mode 100644 index 0000000000..a4c3f39e14 Binary files /dev/null and b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 60c1470b89..ea66897b35 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -321,20 +321,35 @@ with the same filename but different name + + + + + + + + + + + + + + + @@ -585,10 +600,15 @@ with the same filename but different name scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" /> + + + + + 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" -- cgit v1.2.3