summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorErica Olsen <erica@lindenlab.com>2009-09-22 17:31:39 +0000
committerErica Olsen <erica@lindenlab.com>2009-09-22 17:31:39 +0000
commitbe41bf82c6325fc45c7c6474645f384479e27091 (patch)
treec7659957316914b36ce26ec326f197fc43cea078 /indra/newview/skins/default
parent536e38ad51b89808f26d8e3cd107fe093862d22a (diff)
EXT-1106 Add new art to viewer - 9/22/09 Added this week's art drop and referenced in textures.xml, EXT-1073 Add icon and style the L$ Balance button in top navigation bar
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/colors.xml3
-rw-r--r--indra/newview/skins/default/textures/build/Object_Cone.pngbin0 -> 481 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Cube.pngbin0 -> 370 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Cylinder.pngbin0 -> 373 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Grass.pngbin0 -> 456 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Hemi_Cone.pngbin0 -> 441 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.pngbin0 -> 378 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Hemi_Sphere.pngbin0 -> 545 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Prism.pngbin0 -> 395 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Pyramid.pngbin0 -> 452 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Ring.pngbin0 -> 615 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Sphere.pngbin0 -> 737 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Tetrahedron.pngbin0 -> 411 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Torus.pngbin0 -> 803 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Tree.pngbin0 -> 737 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Object_Tube.pngbin0 -> 460 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Tool_Create.pngbin0 -> 705 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Tool_Dozer.pngbin0 -> 492 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Tool_Face.pngbin0 -> 304 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Tool_Grab.pngbin0 -> 417 bytes
-rw-r--r--indra/newview/skins/default/textures/build/Tool_Zoom.pngbin0 -> 533 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Icon_For_Sale.pngbin6654 -> 572 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Microphone_On.pngbin0 -> 340 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_1.pngbin0 -> 464 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_10.pngbin0 -> 461 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_11.pngbin0 -> 471 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_12.pngbin0 -> 457 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_2.pngbin0 -> 461 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_3.pngbin0 -> 487 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_4.pngbin0 -> 466 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_5.pngbin0 -> 477 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_6.pngbin0 -> 460 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_7.pngbin0 -> 483 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_8.pngbin0 -> 467 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Progress_9.pngbin0 -> 483 bytes
-rw-r--r--indra/newview/skins/default/textures/navbar/BuyArrow_Over.pngbin263 -> 2985 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.pngbin0 -> 435 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.pngbin808 -> 273 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.pngbin835 -> 349 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.pngbin307 -> 297 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.pngbin452 -> 359 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.pngbin361 -> 367 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.pngbin599 -> 536 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.pngbin0 -> 709 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.pngbin350 -> 335 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.pngbin476 -> 456 bytes
-rw-r--r--indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.pngbin219 -> 272 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml57
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_side_tray.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml116
51 files changed, 127 insertions, 66 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 48ea09d7a2..da1cd59619 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -43,6 +43,9 @@
name="DkGray2"
value="0.169 0.169 0.169 1" />
<color
+ name="MouseGray"
+ value="0.191 0.191 0.191 1" />
+ <color
name="Black"
value="0 0 0 1" />
<color
diff --git a/indra/newview/skins/default/textures/build/Object_Cone.png b/indra/newview/skins/default/textures/build/Object_Cone.png
new file mode 100644
index 0000000000..5167f1a820
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Cone.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Cube.png b/indra/newview/skins/default/textures/build/Object_Cube.png
new file mode 100644
index 0000000000..e82af1ca82
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Cube.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Cylinder.png
new file mode 100644
index 0000000000..fe1041d4c7
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Cylinder.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Grass.png b/indra/newview/skins/default/textures/build/Object_Grass.png
new file mode 100644
index 0000000000..a88efd5f3e
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Grass.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
new file mode 100644
index 0000000000..595f64d480
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
new file mode 100644
index 0000000000..dd41d56fb3
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
new file mode 100644
index 0000000000..1489630624
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Prism.png b/indra/newview/skins/default/textures/build/Object_Prism.png
new file mode 100644
index 0000000000..51c6c161a0
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Prism.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid.png b/indra/newview/skins/default/textures/build/Object_Pyramid.png
new file mode 100644
index 0000000000..a147b59553
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Pyramid.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Ring.png b/indra/newview/skins/default/textures/build/Object_Ring.png
new file mode 100644
index 0000000000..a9790fd60c
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Ring.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere.png b/indra/newview/skins/default/textures/build/Object_Sphere.png
new file mode 100644
index 0000000000..8e2dd92a82
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Sphere.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
new file mode 100644
index 0000000000..23e22b1796
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Torus.png b/indra/newview/skins/default/textures/build/Object_Torus.png
new file mode 100644
index 0000000000..15c62423a9
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Torus.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tree.png b/indra/newview/skins/default/textures/build/Object_Tree.png
new file mode 100644
index 0000000000..82c422419b
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Tree.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Object_Tube.png b/indra/newview/skins/default/textures/build/Object_Tube.png
new file mode 100644
index 0000000000..e47fce7511
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Object_Tube.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Tool_Create.png b/indra/newview/skins/default/textures/build/Tool_Create.png
new file mode 100644
index 0000000000..1f1097def5
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Tool_Create.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Tool_Dozer.png b/indra/newview/skins/default/textures/build/Tool_Dozer.png
new file mode 100644
index 0000000000..61744666f4
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Tool_Dozer.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Tool_Face.png b/indra/newview/skins/default/textures/build/Tool_Face.png
new file mode 100644
index 0000000000..5ab42a4ad6
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Tool_Face.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Tool_Grab.png b/indra/newview/skins/default/textures/build/Tool_Grab.png
new file mode 100644
index 0000000000..5c58288d5e
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Tool_Grab.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/build/Tool_Zoom.png b/indra/newview/skins/default/textures/build/Tool_Zoom.png
new file mode 100644
index 0000000000..ad493b0d66
--- /dev/null
+++ b/indra/newview/skins/default/textures/build/Tool_Zoom.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
index 01e8697138..3dec6b989c 100644
--- a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
+++ b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Microphone_On.png b/indra/newview/skins/default/textures/icons/Microphone_On.png
new file mode 100644
index 0000000000..c96b500fa1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Microphone_On.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png
new file mode 100644
index 0000000000..58b56003c4
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_1.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png
new file mode 100644
index 0000000000..07fe0be8a3
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_10.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png
new file mode 100644
index 0000000000..215d68cc46
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_11.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png
new file mode 100644
index 0000000000..d755588621
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_12.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png
new file mode 100644
index 0000000000..6640ee227b
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_2.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png
new file mode 100644
index 0000000000..5decbe977e
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_3.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png
new file mode 100644
index 0000000000..56e81c17aa
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_4.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png
new file mode 100644
index 0000000000..a89bf2ac62
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_5.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png
new file mode 100644
index 0000000000..233c479540
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_6.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png
new file mode 100644
index 0000000000..631d7a6819
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_7.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png
new file mode 100644
index 0000000000..ac0e3f13f7
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_8.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png
new file mode 100644
index 0000000000..17fb4a0335
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Progress_9.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
index 428da506f3..7c10aaaead 100644
--- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
+++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
new file mode 100644
index 0000000000..213acbe87b
--- /dev/null
+++ b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png
index 2dc32a576b..0b91abfb0d 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png
index bea218a2fb..33a47236a5 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
index 2d36f70361..760db9360d 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png
index 3c20459126..905d4c973e 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Selected.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
index c272372a39..691b600510 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png
index 3828752606..909f0d0a47 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Selected.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png
new file mode 100644
index 0000000000..cc505c4a30
--- /dev/null
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Large.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
index d7ec33af55..ada28e01da 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
index dd7e361ea9..0f8d5619ec 100644
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Selected.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
index 918be7555f..4ed7a2b183 100644
--- a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9e87ddb373..31d65972af 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -7,6 +7,8 @@
<texture name="Accordion_Off" file_name="containers/Accordion_Off.png" preload="false" />
<texture name="Accordion_Press" file_name="containers/Accordion_Press.png" preload="false" />
+<texture name="Activate_Checkmark" file_name="taskpanel/Activate_Checkmark.png" preload="false" />
+
<texture name="AddItem_Disabled" file_name="icons/AddItem_Disabled.png" preload="false" />
<texture name="AddItem_Off" file_name="icons/AddItem_Off.png" preload="false" />
<texture name="AddItem_Press" file_name="icons/AddItem_Press.png" preload="false" />
@@ -98,6 +100,8 @@
<texture name="Generic_Person" file_name="icons/Generic_Person.png" preload="false" />
<texture name="Generic_Person_Large" file_name="icons/Generic_Person_Large.png" preload="false" />
+ <texture name="Health" file_name="icons/Health.png" preload="false" />
+
<texture name="Help_Off" file_name="navbar/Help_Off.png" preload="false" />
<texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" />
@@ -115,7 +119,7 @@
<texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
<texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
- <texture name="Icon_For_Sale" file_name="windows/Icon_For_sale.png" preload="false" />
+ <texture name="Icon_For_Sale" file_name="icons/Icon_For_sale.png" preload="false" />
<texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
<texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
@@ -176,6 +180,11 @@
<texture name="Lock" file_name="icons/Lock.png" preload="false" />
+ <texture name="Login_Pod" file_name="windows/Login_Pod.png" preload="true" />
+
+ <texture name="Microphone_Mute" file_name="icons/Microphone_Mute.png" preload="false" />
+ <texture name="Microphone_On" file_name="icons/Microphone_On.png" preload="false" />
+
<texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
<texture name="Move_Fly_Disabled" file_name="bottomtray/Move_Fly_Disabled.png" preload="false" />
@@ -211,6 +220,21 @@
<texture name="NearbyVoice_Lvl3" file_name="bottomtray/NearbyVoice_Lvl3.png" preload="false" />
<texture name="NearbyVoice_On" file_name="bottomtray/NearbyVoice_On.png" preload="false" />
+ <texture name="Object_Cone" file_name="build/Object_Cone.png" preload="false" />
+ <texture name="Object_Cube" file_name="build/Object_Cube.png" preload="false" />
+ <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
+ <texture name="Object_Grass" file_name="build/Object_Grass.png" preload="false" />
+ <texture name="Object_Hemi_Cone" file_name="build/Object_Hemi_Cone.png" preload="false" />
+ <texture name="Object_Hemi_Sphere" file_name="build/Object_Hemi_Sphere.png" preload="false" />
+ <texture name="Object_Prism" file_name="build/Object_Prism.png" preload="false" />
+ <texture name="Object_Pyramid" file_name="build/Object_Pyramid.png" preload="false" />
+ <texture name="Object_Ring" file_name="build/Object_Ring.png" preload="false" />
+ <texture name="Object_Sphere" file_name="build/Object_Sphere.png" preload="false" />
+ <texture name="Object_Tetrahedron" file_name="build/Object_Tetrahedron.png" preload="false" />
+ <texture name="Object_Torus" file_name="build/Object_Torus.png" preload="false" />
+ <texture name="Object_Tree" file_name="build/Object_Tree.png" preload="false" />
+ <texture name="Object_Tube" file_name="build/Object_Tube.png" preload="false" />
+
<texture name="OptionsMenu_Disabled" file_name="icons/OptionsMenu_Disabled.png" preload="false" />
<texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
<texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
@@ -222,6 +246,19 @@
<texture name="Overhead_M" file_name="world/Overhead_M.png" preload="false" />
<texture name="Overhead_S" file_name="world/Overhead_S.png" preload="false" />
+ <texture name="Progress_1" file_name="icons/Progress_1.png" preload="false" />
+ <texture name="Progress_2" file_name="icons/Progress_2.png" preload="false" />
+ <texture name="Progress_3" file_name="icons/Progress_3.png" preload="false" />
+ <texture name="Progress_4" file_name="icons/Progress_4.png" preload="false" />
+ <texture name="Progress_5" file_name="icons/Progress_5.png" preload="false" />
+ <texture name="Progress_6" file_name="icons/Progress_6.png" preload="false" />
+ <texture name="Progress_7" file_name="icons/Progress_7.png" preload="false" />
+ <texture name="Progress_8" file_name="icons/Progress_8.png" preload="false" />
+ <texture name="Progress_9" file_name="icons/Progress_9.png" preload="false" />
+ <texture name="Progress_10" file_name="icons/Progress_10.png" preload="false" />
+ <texture name="Progress_11" file_name="icons/Progress_11.png" preload="false" />
+ <texture name="Progress_12" file_name="icons/Progress_12.png" preload="false" />
+
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" />
<texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
@@ -239,6 +276,9 @@
<texture name="RadioButton_Disabled" file_name="widgets/RadioButton_Disabled.png" preload="true" />
<texture name="RadioButton_On_Disabled" file_name="widgets/RadioButton_On_Disabled.png" preload="true" />
+ <texture name="Rec_Off" file_name="icons/Rec_Off.png" preload="false" />
+ <texture name="Rec_On" file_name="icons/Rec_On.png" preload="false" />
+
<texture name="Refresh_Disabled" file_name="icons/Refresh_Disabled.png" preload="false" />
<texture name="Refresh_Off" file_name="icons/Refresh_Off.png" preload="false" />
<texture name="Refresh_Press" file_name="icons/Refresh_Press.png" preload="false" />
@@ -297,6 +337,7 @@
<texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true" />
<texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true" />
+ <texture name="TabIcon_Appearance_Large" file_name="taskpanel/TabIcon_Appearance_Large.png" preload="false" />
<texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
<texture name="TabIcon_Appearance_Over" file_name="taskpanel/TabIcon_Appearance_Over.png" preload="false" />
<texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" />
@@ -305,20 +346,24 @@
<texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" />
<texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" />
<texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" />
+ <texture name="TabIcon_Me_Large" file_name="taskpanel/TabIcon_Me_Large.png" preload="false" />
<texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" />
<texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false" />
<texture name="TabIcon_Me_Selected" file_name="taskpanel/TabIcon_Me_Selected.png" preload="false" />
<texture name="TabIcon_Open_Off" file_name="taskpanel/TabIcon_Open_Off.png" preload="false" />
<texture name="TabIcon_Open_Over" file_name="taskpanel/TabIcon_Open_Over.png" preload="false" />
+ <texture name="TabIcon_People_Large" file_name="taskpanel/TabIcon_People_Large.png" preload="false" />
<texture name="TabIcon_People_Off" file_name="taskpanel/TabIcon_People_Off.png" preload="false" />
<texture name="TabIcon_People_Over" file_name="taskpanel/TabIcon_People_Over.png" preload="false" />
<texture name="TabIcon_People_Selected" file_name="taskpanel/TabIcon_People_Selected.png" preload="false" />
- <texture name="TabIcon_Places_Over" file_name="taskpanel/TabIcon_Places_Over.png" preload="false" />
+ <texture name="TabIcon_Places_Large" file_name="taskpanel/TabIcon_Places_Large.png" preload="false" />
<texture name="TabIcon_Places_Off" file_name="taskpanel/TabIcon_Places_Off.png" preload="false" />
+ <texture name="TabIcon_Places_Over" file_name="taskpanel/TabIcon_Places_Over.png" preload="false" />
<texture name="TabIcon_Places_Selected" file_name="taskpanel/TabIcon_Places_Selected.png" preload="false" />
+ <texture name="TabIcon_Things_Large" file_name="taskpanel/TabIcon_Things_Large.png" preload="false" />
<texture name="TabIcon_Things_Off" file_name="taskpanel/TabIcon_Things_Off.png" preload="false" />
- <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="false" />
<texture name="TabIcon_Things_Over" file_name="taskpanel/TabIcon_Things_Over.png" preload="false" />
+ <texture name="TabIcon_Things_Selected" file_name="taskpanel/TabIcon_Things_Selected.png" preload="false" />
<texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" />
<texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" />
@@ -346,6 +391,12 @@
<texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
<texture name="Toast" file_name="windows/Toast.png" preload="true" />
+ <texture name="Tool_Create" file_name="build/Tool_Create.png" preload="false" />
+ <texture name="Tool_Dozer" file_name="build/Tool_Dozer.png" preload="false" />
+ <texture name="Tool_Face" file_name="build/Tool_Face.png" preload="false" />
+ <texture name="Tool_Grab" file_name="build/Tool_Grab.png" preload="false" />
+ <texture name="Tool_Zoom" file_name="build/Tool_Zoom.png" preload="false" />
+
<texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" />
<texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" />
<texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 80dca8c0c1..13ceab7604 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -2,7 +2,7 @@
<panel
background_opaque="true"
background_visible="true"
- bg_opaque_color="0.25 0.25 0.25 1"
+ bg_opaque_color="MouseGray"
follows="left|top|right"
height="60"
layout="topleft"
@@ -14,7 +14,7 @@
height="60"
layout="topleft"
name="navigation_panel"
- width="600">
+ width="600">
<button
follows="left|top"
font="SansSerifSmall"
@@ -32,7 +32,7 @@
tool_tip="Go back to previous location"
top="3"
width="31" />
-
+
<button
follows="left|top"
font="SansSerifSmall"
@@ -90,7 +90,7 @@
width="20" />
-->
</location_input>
-
+
<!-- <button -->
<!-- follows="right|top" -->
<!-- height="20" -->
@@ -128,7 +128,7 @@
label="Search" />
</search_combo_box>
</panel>
-
+
<favorites_bar
follows="left|right|top"
height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index c5ebc8e1a3..418b88b7b5 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -11,7 +11,7 @@
help_topic="sidebar_home"
tab_title="Home"
description="Home."
- image="BackArrow_Off"
+ image="TabIcon_Open_Off"
mouse_opaque="false"
background_opaque="false"
background_visible="true"
@@ -59,6 +59,7 @@
filename="panel_group_info_sidetray.xml"
label="Group Info"
border="true"
+ font="SansSerifBold"
/>
<panel
class="panel_block_list_sidetray"
@@ -66,6 +67,7 @@
filename="panel_block_list_sidetray.xml"
label="Blocked Residents &amp; Objects"
border="true"
+ font="SansSerifBold"
/>
</panel_container>
@@ -86,6 +88,7 @@
filename="panel_places.xml"
label="Places"
border="true"
+ font="SansSerifBold"
/>
</sidetray_tab>
@@ -123,6 +126,8 @@
name="panel_appearance"
filename="panel_appearance.xml"
border="true"
+ label="Edit Appearance"
+ font="SansSerifBold"
/>
</sidetray_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index f597211ec9..c178554287 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -2,14 +2,14 @@
<panel
background_opaque="true"
background_visible="true"
- bg_opaque_color="0.25 0.25 0.25 1"
+ bg_opaque_color="MouseGray"
follows="top|left|right"
- height="18"
+ height="19"
layout="topleft"
left="0"
mouse_opaque="false"
name="status"
- top="18"
+ top="19"
width="1000">
<panel.string
name="StatBarDaysOfWeek">
@@ -41,164 +41,166 @@
</panel.string>
<button
auto_resize="true"
+ halign="left"
follows="right|bottom"
font="SansSerifSmall"
- height="16"
+ image_color="White_05"
+ flash_color="EmphasisColor"
+ image_overlay="BuyArrow_Over"
+ height="18"
layout="topleft"
- left="-150"
+ left="-210"
name="buycurrency"
picture_style="true"
- tool_tip="Account Balance / Buy currency"
- top="1"
- width="60" />
+ tool_tip="My Balance / Buy currency"
+ top="0"
+ width="117" />
<text
type="string"
length="1"
disabled_color="TimeTextColor"
follows="right|bottom"
halign="right"
- height="20"
+ height="16"
+ top="3"
layout="topleft"
left_pad="5"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current Time (Pacific)"
- top_delta="-1"
- v_pad="2"
width="80">
12:00 AM
</text>
<button
follows="right|bottom"
height="16"
- image_selected="status_script_debug.tga"
- image_unselected="status_script_debug.tga"
layout="topleft"
left_delta="-537"
+ image_selected="Inv_DangerousScript"
+ image_unselected="Inv_DangerousScript"
name="scriptout"
picture_style="true"
scale_image="false"
tool_tip="Script Warnings and Errors"
- top_delta="2"
+ top="0"
visible="false"
width="16" />
<button
follows="right|bottom"
- height="18"
- image_selected="status_health.tga"
- image_unselected="status_health.tga"
+ height="16"
+ image_selected="Health"
+ image_unselected="Health"
layout="topleft"
- left_delta="16"
+ left_pad="7"
name="health"
picture_style="true"
scale_image="false"
tool_tip="Health"
- top_delta="2"
+ top="0"
visible="false"
- width="24" />
+ width="16" />
<text
type="string"
length="1"
disabled_color="HealthTextColor"
follows="rsight|bottom"
font_shadow="hard"
- height="18"
+ height="16"
layout="topleft"
- left_delta="24"
+ left_pad="18"
name="HealthText"
text_color="HealthTextColor"
tool_tip="Health"
- top_delta="-4"
- v_pad="2"
+ top="0"
visible="false"
width="31">
100%
</text>
<button
follows="right|bottom"
- height="18"
- image_selected="status_no_fly.tga"
- image_unselected="status_no_fly.tga"
+ height="16"
+ image_selected="Move_Fly_Disabled"
+ image_unselected="Move_Fly_Disabled"
layout="topleft"
- left_delta="31"
+ left_pad="7"
name="no_fly"
picture_style="true"
scale_image="false"
tool_tip="Flying not allowed"
- top_delta="4"
+ top="3"
visible="false"
- width="24" />
+ width="16" />
<button
follows="right|bottom"
- height="18"
- image_selected="status_no_build.tga"
- image_unselected="status_no_build.tga"
+ height="16"
+ image_selected="Tool_Create"
+ image_unselected="Tool_Create"
layout="topleft"
- left_delta="24"
+ left_pad="7"
name="no_build"
picture_style="true"
scale_image="false"
tool_tip="Building/Rezzing not allowed"
- top_delta="0"
+ top="0"
visible="false"
- width="24" />
+ width="16" />
<button
follows="right|bottom"
- height="18"
- image_selected="status_no_scripts.tga"
- image_unselected="status_no_scripts.tga"
+ height="16"
+ image_selected="Inv_Script"
+ image_unselected="Inv_Script"
layout="topleft"
- left_delta="24"
+ left_pad="7"
name="no_scripts"
picture_style="true"
scale_image="false"
tool_tip="Scripts not allowed"
- top_delta="0"
+ top="0"
visible="false"
- width="24" />
+ width="16" />
<button
follows="right|bottom"
- height="18"
- image_selected="status_no_push.tga"
- image_unselected="status_no_push.tga"
+ height="16"
+ image_selected="Inv_Gesture"
+ image_unselected="Inv_Gesture"
layout="topleft"
- left_delta="24"
+ left_pad="7"
name="restrictpush"
picture_style="true"
scale_image="false"
tool_tip="No Pushing"
- top_delta="0"
+ top="0"
visible="false"
- width="24" />
+ width="16" />
<button
follows="right|bottom"
height="18"
- image_selected="status_no_voice.tga"
- image_unselected="status_no_voice.tga"
+ image_selected="Microphone_Mute"
+ image_unselected="Microphone_Mute"
layout="topleft"
- left_delta="24"
+ left_pad="7"
name="status_no_voice"
picture_style="true"
scale_image="false"
tool_tip="Voice not available here"
- top_delta="0"
+ top="1"
visible="false"
- width="24" />
+ width="16" />
<button
follows="right|bottom"
height="16"
- image_selected="status_buy_land_pressed.tga"
- image_unselected="status_buy_land.tga"
+ image_selected="Icon_For_Sale"
+ image_unselected="Icon_For_Sale"
layout="topleft"
left_pad="7"
name="buyland"
picture_style="true"
tool_tip="Buy this parcel"
- top_delta="-3"
+ top="0"
visible="false"
width="16" />
<text
- enabled="false"
+ enabled="true"
follows="right|bottom"
halign="center"
height="12"