From 73e6407af8f802bbc4a3932bc5ac32ca8f13ab56 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Fri, 7 May 2010 22:07:01 +0300 Subject: EXT-2493 FIXED Added strafe buttons. - Added slide left and Move right buttons to movement actions panel, when inserting them in xml organized buttons in panel into 3 columns to make their position more easily configurable. - Removed hiding of fly up and down buttons. When not flying(in walk/run mode) they act as jump ans crouch. - Added movement mode(walk/run/fly) dependent tooltips for fly/jump/crouch and slide buttons. - Added comment regarding implementation of move floater buttons toggling when user moves via keyboard (because it's not quite obvious and time consuming when you first encounter it) to LLFloaterMove::postBuild(). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/360 --HG-- branch : product-engine --- .../default/textures/bottomtray/Movement_Left_Off.png | Bin 0 -> 47887 bytes .../default/textures/bottomtray/Movement_Left_On.png | Bin 0 -> 47995 bytes .../default/textures/bottomtray/Movement_Right_Off.png | Bin 0 -> 48333 bytes .../default/textures/bottomtray/Movement_Right_On.png | Bin 0 -> 47187 bytes indra/newview/skins/default/textures/textures.xml | 4 ++++ 5 files changed, 4 insertions(+) create mode 100644 indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png new file mode 100644 index 0000000000..ded370a46f Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png new file mode 100644 index 0000000000..98bf415f84 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png new file mode 100644 index 0000000000..2d8d55fa91 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png new file mode 100644 index 0000000000..a91517d31f Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index bbb82d86b1..15bac6de0d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -241,6 +241,10 @@ with the same filename but different name + + + + -- cgit v1.2.3 From 64da5083d0b99d58140d84f9a44191b5c3d321b1 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 11 May 2010 13:01:27 -0400 Subject: EXT-7306 : FIXED : Add shortcut-style icons for inventory links EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code Inventory link icons were designed from scratch. Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges. --- indra/newview/skins/default/textures/textures.xml | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 15bac6de0d..c4f90dee3e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -214,6 +214,40 @@ with the same filename but different name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From afb366ad7e9d667b7bf4e9a7f58f565182c7ee5b Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 12 May 2010 15:46:26 +0300 Subject: EXT-7206 ADDITIONAL COMMIT Added missing avatar sex icons. --HG-- branch : product-engine --- indra/newview/skins/default/textures/icons/Female.png | Bin 0 -> 309 bytes indra/newview/skins/default/textures/icons/Male.png | Bin 0 -> 302 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Female.png create mode 100644 indra/newview/skins/default/textures/icons/Male.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Female.png b/indra/newview/skins/default/textures/icons/Female.png new file mode 100644 index 0000000000..67b5653a94 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Female.png differ diff --git a/indra/newview/skins/default/textures/icons/Male.png b/indra/newview/skins/default/textures/icons/Male.png new file mode 100644 index 0000000000..f3fad77fd0 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Male.png differ -- cgit v1.2.3 From 059a71423019b6a38c41e2dae6d3e879aa893beb Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Thu, 13 May 2010 15:54:23 +0300 Subject: EXT-7045 FIX Group profile not using placeholder art add placeholder art, add code to convert texture name to ID since LLTextureCtrl can't accept textures by name... Reviwed V.Savchuk at https://codereview.productengine.com/secondlife/r/378 --HG-- branch : product-engine --- .../skins/default/textures/icons/Generic_Group_Large.png | Bin 0 -> 7905 bytes indra/newview/skins/default/textures/textures.xml | 1 + 2 files changed, 1 insertion(+) create mode 100644 indra/newview/skins/default/textures/icons/Generic_Group_Large.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png new file mode 100644 index 0000000000..c067646c65 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index bbb82d86b1..1a0a8990c2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -135,6 +135,7 @@ with the same filename but different name + -- cgit v1.2.3 From 49a79a3f68dccd985d2f0f2462eabc210d215736 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 20 May 2010 14:31:31 +0300 Subject: EXT-7200 FIXED Integrated art missing from appearance. Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels). Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/ --HG-- branch : product-engine --- .../skins/default/textures/icons/DownArrow_Off.png | Bin 0 -> 217 bytes .../skins/default/textures/icons/Edit_Wrench.png | Bin 0 -> 724 bytes .../default/textures/icons/Hierarchy_View_Disabled.png | Bin 0 -> 178 bytes .../skins/default/textures/icons/Hierarchy_View_On.png | Bin 0 -> 183 bytes .../default/textures/icons/List_View_Disabled.png | Bin 0 -> 158 bytes .../skins/default/textures/icons/List_View_On.png | Bin 0 -> 160 bytes .../skins/default/textures/icons/Locked_Icon.png | Bin 0 -> 306 bytes .../skins/default/textures/icons/Search_Icon.png | Bin 0 -> 552 bytes .../skins/default/textures/icons/Shirt_Large.png | Bin 0 -> 471 bytes .../skins/default/textures/icons/UpArrow_Off.png | Bin 0 -> 219 bytes indra/newview/skins/default/textures/textures.xml | 17 +++++++++++++++++ .../newview/skins/default/textures/windows/Dragbar.png | Bin 0 -> 348 bytes 12 files changed, 17 insertions(+) create mode 100644 indra/newview/skins/default/textures/icons/DownArrow_Off.png create mode 100644 indra/newview/skins/default/textures/icons/Edit_Wrench.png create mode 100644 indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png create mode 100644 indra/newview/skins/default/textures/icons/Hierarchy_View_On.png create mode 100644 indra/newview/skins/default/textures/icons/List_View_Disabled.png create mode 100644 indra/newview/skins/default/textures/icons/List_View_On.png create mode 100644 indra/newview/skins/default/textures/icons/Locked_Icon.png create mode 100644 indra/newview/skins/default/textures/icons/Search_Icon.png create mode 100644 indra/newview/skins/default/textures/icons/Shirt_Large.png create mode 100644 indra/newview/skins/default/textures/icons/UpArrow_Off.png create mode 100644 indra/newview/skins/default/textures/windows/Dragbar.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/DownArrow_Off.png b/indra/newview/skins/default/textures/icons/DownArrow_Off.png new file mode 100644 index 0000000000..60f62eed4a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/DownArrow_Off.png differ diff --git a/indra/newview/skins/default/textures/icons/Edit_Wrench.png b/indra/newview/skins/default/textures/icons/Edit_Wrench.png new file mode 100644 index 0000000000..1c43960d02 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Edit_Wrench.png differ diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png new file mode 100644 index 0000000000..fb370f98d5 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png differ diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png new file mode 100644 index 0000000000..c590a5a5d3 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png differ diff --git a/indra/newview/skins/default/textures/icons/List_View_Disabled.png b/indra/newview/skins/default/textures/icons/List_View_Disabled.png new file mode 100644 index 0000000000..155dee5047 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/List_View_Disabled.png differ diff --git a/indra/newview/skins/default/textures/icons/List_View_On.png b/indra/newview/skins/default/textures/icons/List_View_On.png new file mode 100644 index 0000000000..9127c92c3b Binary files /dev/null and b/indra/newview/skins/default/textures/icons/List_View_On.png differ diff --git a/indra/newview/skins/default/textures/icons/Locked_Icon.png b/indra/newview/skins/default/textures/icons/Locked_Icon.png new file mode 100644 index 0000000000..8ead280794 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Locked_Icon.png differ diff --git a/indra/newview/skins/default/textures/icons/Search_Icon.png b/indra/newview/skins/default/textures/icons/Search_Icon.png new file mode 100644 index 0000000000..541aa8f52a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Search_Icon.png differ diff --git a/indra/newview/skins/default/textures/icons/Shirt_Large.png b/indra/newview/skins/default/textures/icons/Shirt_Large.png new file mode 100644 index 0000000000..0f3846bccc Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Shirt_Large.png differ diff --git a/indra/newview/skins/default/textures/icons/UpArrow_Off.png b/indra/newview/skins/default/textures/icons/UpArrow_Off.png new file mode 100644 index 0000000000..00015bce20 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/UpArrow_Off.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f4206dc2e5..0788a0ca9e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -110,6 +110,8 @@ with the same filename but different name + + @@ -119,6 +121,7 @@ with the same filename but different name + @@ -145,6 +148,9 @@ with the same filename but different name + + + @@ -255,9 +261,14 @@ with the same filename but different name + + + + + @@ -410,6 +421,8 @@ with the same filename but different name + + @@ -432,6 +445,8 @@ with the same filename but different name + + @@ -523,6 +538,8 @@ with the same filename but different name + + diff --git a/indra/newview/skins/default/textures/windows/Dragbar.png b/indra/newview/skins/default/textures/windows/Dragbar.png new file mode 100644 index 0000000000..d94dda1aae Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Dragbar.png differ -- cgit v1.2.3 From a2600644ab39cc634e2da13bb06c39c757887a72 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 25 May 2010 16:51:06 -0700 Subject: DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer --- indra/newview/skins/default/textures/textures.xml | 5 +++++ .../skins/default/textures/widgets/bevel_background.png | Bin 0 -> 365 bytes .../newview/skins/default/textures/widgets/buy_off.png | Bin 0 -> 54754 bytes .../newview/skins/default/textures/widgets/buy_over.png | Bin 0 -> 54772 bytes .../skins/default/textures/widgets/buy_press.png | Bin 0 -> 54861 bytes 5 files changed, 5 insertions(+) create mode 100644 indra/newview/skins/default/textures/widgets/bevel_background.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_off.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_over.png create mode 100644 indra/newview/skins/default/textures/widgets/buy_press.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0788a0ca9e..2c1cb59387 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -649,4 +649,9 @@ with the same filename but different name + + + + + diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png new file mode 100644 index 0000000000..fb5067503d Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/bevel_background.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png new file mode 100644 index 0000000000..961ad071d4 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_off.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png new file mode 100644 index 0000000000..0be19f8a31 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_over.png differ diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png new file mode 100644 index 0000000000..d6f587464d Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/buy_press.png differ -- cgit v1.2.3 From d7604af18048d4dcc1d0e3685ddd5dfdddfbe051 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 26 May 2010 18:28:31 +0300 Subject: EXT-7255 FIXED Added dragbar into edit outfit panel. I was going to implement dragbar via icon rendered in LLResizeBar. Layout panel marked as user_resize=true would have resize bar icon next to it. But there is an issue in layout stack when user_resize is possible only if there are more than one layout panels with user_resize=true. And applied resize icon (dragbar) is rendered where it is not necessary. See EXT-7471 for details. So, dragbar was implemented as a workaround: added an icon with dragbar into the "add to outfit" panel. Also layout of the "add to outfit" panel was updated to match spec. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/441/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/textures.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2c1cb59387..91890009f4 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -111,7 +111,7 @@ with the same filename but different name - + -- cgit v1.2.3 From 097f9711f22df449c11b3dcd960186a206bcd3ac Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 27 May 2010 18:36:07 +0300 Subject: EXT-2260 FIXED Changed camera floater according to new style - Implemented new widget- panel_camera_item, to use in camera floater. They are used inside of two panels. Their order is configurable via XML. Mouse down callbacks and images which are used for selected and and unselected items are also set in XML. - Now there are only 3 buttons instead of four at the bottom of the floater- pan and orbit are now shown simultaneously. - Implemented correct work of object view after moving from camera modes to presets list (and back). It wasn't workin completely correct in old version of floater. - Integrated new art. Reviewed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/436/ --HG-- branch : product-engine --- .../textures/bottomtray/Cam_Preset_Back_Off.png | Bin 700 -> 49285 bytes .../textures/bottomtray/Cam_Preset_Back_On.png | Bin 754 -> 50855 bytes .../textures/bottomtray/Cam_Preset_Front_Off.png | Bin 959 -> 50394 bytes .../textures/bottomtray/Cam_Preset_Front_On.png | Bin 1087 -> 50127 bytes .../textures/bottomtray/Cam_Preset_Side_Off.png | Bin 945 -> 49268 bytes .../textures/bottomtray/Cam_Preset_Side_On.png | Bin 1049 -> 50209 bytes .../textures/bottomtray/Mouselook_View_Off.png | Bin 0 -> 51189 bytes .../textures/bottomtray/Mouselook_View_On.png | Bin 0 -> 53113 bytes .../default/textures/bottomtray/Object_View_Off.png | Bin 0 -> 55000 bytes .../default/textures/bottomtray/Object_View_On.png | Bin 0 -> 51183 bytes .../textures/bottomtray/PanOrbit_Disabled.png | Bin 0 -> 50975 bytes .../default/textures/bottomtray/PanOrbit_Off.png | Bin 0 -> 51539 bytes .../default/textures/bottomtray/PanOrbit_Over.png | Bin 0 -> 54713 bytes .../default/textures/bottomtray/PanOrbit_Press.png | Bin 0 -> 51053 bytes indra/newview/skins/default/textures/textures.xml | 7 +++++++ 15 files changed, 7 insertions(+) create mode 100644 indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Object_View_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Object_View_On.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png create mode 100644 indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png index 3cfe2e850e..00158a7bc2 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png index bb5d85e410..3748f5e190 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png index 9876aa456c..c49b8f9a27 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png index f481fed88c..bc8c4db04d 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png index d58b4ff990..b919a0a152 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png index 6e73898992..de9da359a0 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png new file mode 100644 index 0000000000..8d32cad95f Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png new file mode 100644 index 0000000000..4c98e35868 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png new file mode 100644 index 0000000000..e9dea7e17e Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png new file mode 100644 index 0000000000..7a348ba22e Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png new file mode 100644 index 0000000000..20fa40e127 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Disabled.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png new file mode 100644 index 0000000000..53efa3a9a9 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png new file mode 100644 index 0000000000..f1420e0002 Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Over.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png new file mode 100644 index 0000000000..89a6269edc Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Press.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 91890009f4..57f23c7e76 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -278,6 +278,9 @@ with the same filename but different name + + + @@ -338,10 +341,14 @@ with the same filename but different name + + + + -- cgit v1.2.3 From a0351c6ea4446bfa8fc85450c2603251cd703c2c Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 27 May 2010 18:41:28 +0300 Subject: EXT-7200 FIXED Integrated art missing from appearance. Replaced "Shop" button text with icon, changed sizes of buttons according to comments in ticket, also changed heights of hovered and selected icons for items- made them equal to heights of panels they are used on. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/ --HG-- branch : product-engine --- indra/newview/skins/default/textures/icons/Shop.png | Bin 0 -> 647 bytes indra/newview/skins/default/textures/textures.xml | 1 + 2 files changed, 1 insertion(+) create mode 100644 indra/newview/skins/default/textures/icons/Shop.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png new file mode 100644 index 0000000000..d7e0001dc6 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Shop.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 57f23c7e76..29c72a414b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -453,6 +453,7 @@ with the same filename but different name + -- cgit v1.2.3 From fea58764513f2f4a37ac7dba6384bc694c5fa337 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Thu, 27 May 2010 19:35:50 +0300 Subject: EXT-2493 FIXED Changed appearance of moveview floater according to new style guide. Replaced icons with relevant ones and changed positions of items in floater via xml. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/445/ --HG-- branch : product-engine --- .../textures/bottomtray/Movement_Down_Off.png | Bin 419 -> 51706 bytes .../textures/bottomtray/Movement_Down_On.png | Bin 417 -> 50907 bytes .../textures/bottomtray/Movement_Left_Off.png | Bin 47887 -> 51016 bytes .../textures/bottomtray/Movement_Left_On.png | Bin 47995 -> 51806 bytes .../textures/bottomtray/Movement_Right_Off.png | Bin 48333 -> 49845 bytes .../textures/bottomtray/Movement_Right_On.png | Bin 47187 -> 50161 bytes .../default/textures/bottomtray/Movement_Up_Off.png | Bin 371 -> 53763 bytes .../default/textures/bottomtray/Movement_Up_On.png | Bin 370 -> 51965 bytes 8 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png index 1b0192e685..2893c9a9f1 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png index 9f42b7d5b2..f7ed4c25fb 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png index ded370a46f..3602efa9d9 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png index 98bf415f84..2f81fb1588 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png index 2d8d55fa91..9c3fc37dfe 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png index a91517d31f..4f86e81a15 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png index 9b9837cec1..a49c43c2cf 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png index c71d4a7854..ed4902f3ee 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png differ -- cgit v1.2.3 From 95fad9ce8633ea26b7fb7ca2badbf20e68dd8f9d Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Mon, 31 May 2010 18:20:06 +0300 Subject: EXT-7045 FIX update Generic_Group_Large.png no review, binary fix --HG-- branch : product-engine --- .../default/textures/icons/Generic_Group_Large.png | Bin 7905 -> 7061 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png index c067646c65..de8a39fc8a 100644 Binary files a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png and b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png differ -- cgit v1.2.3 From 66ddb437f1eb8327ff74a26943400b9911289a15 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 31 May 2010 22:30:35 +0300 Subject: EXT-7087 FIXED Added flashing icons for im tabs and hooked them up in code Added new attribute image_flash to button.xml which sets an image used for button icon when button is flashing. Pointer to this image is stored in member mImageFlash from LLButton and is used in LLButton::draw(). There are two ways an image can flash now - by making changes in color according to flash_color attribute or by changing icon from current to the one specified in image_flash. Second way is used only if the name of flash icon is different from "FlashIconAbsent" which is there by default. First way is used otherwise. Used new selfmade orange icons for flashing tabs. --HG-- branch : product-engine --- .../default/textures/containers/Toolbar_Left_Flash.png | Bin 0 -> 356 bytes .../default/textures/containers/Toolbar_Middle_Flash.png | Bin 0 -> 316 bytes .../default/textures/containers/Toolbar_Right_Flash.png | Bin 0 -> 428 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ 4 files changed, 3 insertions(+) create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png create mode 100644 indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png new file mode 100644 index 0000000000..9f1e2a469d Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png new file mode 100644 index 0000000000..dd73d655e9 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png differ diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png new file mode 100644 index 0000000000..f6b775c2a0 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 29c72a414b..072ea40ee4 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -527,15 +527,18 @@ with the same filename but different name + + + -- cgit v1.2.3