From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001 From: James Cook <james@lindenlab.com> Date: Mon, 6 Jul 2009 21:58:04 +0000 Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5 --- .../textures/containers/Accordion_ArrowClosed_Off.png | Bin 0 -> 175 bytes .../textures/containers/Accordion_ArrowClosed_Over.png | Bin 0 -> 170 bytes .../textures/containers/Accordion_ArrowClosed_Press.png | Bin 0 -> 175 bytes .../textures/containers/Accordion_ArrowOpened_Over.png | Bin 0 -> 162 bytes .../textures/containers/Accordion_ArrowOpened_Press.png | Bin 0 -> 169 bytes .../skins/default/textures/containers/Accordion_Off.png | Bin 0 -> 239 bytes .../skins/default/textures/containers/Accordion_Over.png | Bin 0 -> 206 bytes .../skins/default/textures/containers/Accordion_Press.png | Bin 0 -> 200 bytes .../skins/default/textures/containers/Container.png | Bin 0 -> 673 bytes .../skins/default/textures/containers/TabTop_Left_Off.png | Bin 0 -> 339 bytes .../default/textures/containers/TabTop_Left_Over.png | Bin 0 -> 337 bytes .../default/textures/containers/TabTop_Left_Selected.png | Bin 0 -> 458 bytes .../default/textures/containers/TabTop_Middle_Off.png | Bin 0 -> 258 bytes .../default/textures/containers/TabTop_Middle_Over.png | Bin 0 -> 285 bytes .../textures/containers/TabTop_Middle_Selected.png | Bin 0 -> 367 bytes .../default/textures/containers/TabTop_Right_Off.png | Bin 0 -> 357 bytes .../default/textures/containers/TabTop_Right_Over.png | Bin 0 -> 362 bytes .../default/textures/containers/TabTop_Right_Selected.png | Bin 0 -> 474 bytes .../default/textures/containers/Toolbar_Left_Off.png | Bin 0 -> 306 bytes .../default/textures/containers/Toolbar_Left_Over.png | Bin 0 -> 310 bytes .../default/textures/containers/Toolbar_Left_Selected.png | Bin 0 -> 380 bytes .../default/textures/containers/Toolbar_Middle_Off.png | Bin 0 -> 224 bytes .../default/textures/containers/Toolbar_Middle_Over.png | Bin 0 -> 228 bytes .../textures/containers/Toolbar_Middle_Selected.png | Bin 0 -> 296 bytes .../default/textures/containers/Toolbar_Right_Off.png | Bin 0 -> 302 bytes .../default/textures/containers/Toolbar_Right_Over.png | Bin 0 -> 297 bytes .../textures/containers/Toolbar_Right_Selected.png | Bin 0 -> 377 bytes 27 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Off.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Accordion_Press.png create mode 100644 indra/newview/skins/default/textures/containers/Container.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Over.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Over.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png (limited to 'indra/newview/skins/default/textures/containers') diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png new file mode 100644 index 0000000000..19c842b816 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png new file mode 100644 index 0000000000..e47f913db1 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png new file mode 100644 index 0000000000..b9879dcc8a Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png new file mode 100644 index 0000000000..e2c67de9c0 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png new file mode 100644 index 0000000000..08f7493a02 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png new file mode 100644 index 0000000000..414f4509c6 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png new file mode 100644 index 0000000000..5416d73310 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png new file mode 100644 index 0000000000..1578e0dfc5 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_Press.png differ diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png new file mode 100644 index 0000000000..511eb94386 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Container.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png new file mode 100644 index 0000000000..1951413f8d Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png new file mode 100644 index 0000000000..295cd89a57 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png new file mode 100644 index 0000000000..8364716e02 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png new file mode 100644 index 0000000000..21f1c2d8a8 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png new file mode 100644 index 0000000000..0758cbcf0d Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png new file mode 100644 index 0000000000..3946917c7c Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png new file mode 100644 index 0000000000..eeef28e5a5 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png new file mode 100644 index 0000000000..c2cbc2b1e5 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png new file mode 100644 index 0000000000..b0f1f16398 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png new file mode 100644 index 0000000000..41b5d24d87 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png new file mode 100644 index 0000000000..083acc0156 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png new file mode 100644 index 0000000000..ee4649a8f9 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png new file mode 100644 index 0000000000..55c02160e3 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png new file mode 100644 index 0000000000..2f6ea90196 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png new file mode 100644 index 0000000000..642113b135 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png new file mode 100644 index 0000000000..01fd765c3d Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png new file mode 100644 index 0000000000..74e00635f1 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png new file mode 100644 index 0000000000..8a0d98a780 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png differ -- cgit v1.2.3 From ca51e8f33dfa0cd455438f11902fb1d839bf6206 Mon Sep 17 00:00:00 2001 From: James Cook <james@lindenlab.com> Date: Mon, 27 Jul 2009 16:50:01 +0000 Subject: Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8 --- .../textures/containers/Accordion_ArrowOpened_Off.png | Bin 0 -> 169 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png (limited to 'indra/newview/skins/default/textures/containers') diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png new file mode 100644 index 0000000000..d506cda5c9 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png differ -- cgit v1.2.3