From 04587bdb9d5e1653d5b19a6ca51e547180994958 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Mon, 6 May 2013 17:53:18 -0700 Subject: ACME-340 Get facebook icon from spec and add to viewer: Added a facebook icon and the icon appears only for the 'Invite people you know to SL' tab. --- indra/newview/skins/default/textures/icons/Facebook.png | Bin 0 -> 365 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Facebook.png (limited to 'indra/newview/skins/default/textures/icons') diff --git a/indra/newview/skins/default/textures/icons/Facebook.png b/indra/newview/skins/default/textures/icons/Facebook.png new file mode 100644 index 0000000000..8287d56f88 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Facebook.png differ -- cgit v1.2.3 From 37fcb81c4ab8806a52ef747e6a3047fff2d6eccf Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 24 Jun 2013 13:32:13 -0700 Subject: ACME-497 : Clean up the xml code for checkin to use a proper icon widget and add a decent default image for it --- .../skins/default/textures/icons/map_placeholder.jpg | Bin 0 -> 15526 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/map_placeholder.jpg (limited to 'indra/newview/skins/default/textures/icons') diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg new file mode 100644 index 0000000000..89f4eb88df Binary files /dev/null and b/indra/newview/skins/default/textures/icons/map_placeholder.jpg differ -- cgit v1.2.3 From e2a7280918665222db3357a4d7566dbdc5d959f2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 24 Jun 2013 17:01:10 -0700 Subject: ACME-582 : Checkin feature: Implement the loading and displaying of map tiles in the LLIconCtrl --- .../default/textures/icons/map_placeholder.jpg | Bin 15526 -> 25641 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures/icons') diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg index 89f4eb88df..0cb86c58d3 100644 Binary files a/indra/newview/skins/default/textures/icons/map_placeholder.jpg and b/indra/newview/skins/default/textures/icons/map_placeholder.jpg differ -- cgit v1.2.3 From 77baf98d12c75621f8b1d69824abf01b9aa260f7 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 7 Aug 2013 18:45:50 -0700 Subject: ACME-820 : Let checkin checkbox be available and swap tile map / default tile when toggling --- .../default/textures/icons/map_placeholder.jpg | Bin 25641 -> 12931 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures/icons') diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg index 0cb86c58d3..57204e2261 100644 Binary files a/indra/newview/skins/default/textures/icons/map_placeholder.jpg and b/indra/newview/skins/default/textures/icons/map_placeholder.jpg differ -- cgit v1.2.3 From abdb549395518954d6c80e50d132d77613275ebd Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 8 Aug 2013 18:57:27 -0700 Subject: ACME-821 : Use 128x128 png for the default tile icon instead of 300x300 jpg --- .../skins/default/textures/icons/map_placeholder.jpg | Bin 12931 -> 0 bytes .../skins/default/textures/icons/map_placeholder.png | Bin 0 -> 7694 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 indra/newview/skins/default/textures/icons/map_placeholder.jpg create mode 100644 indra/newview/skins/default/textures/icons/map_placeholder.png (limited to 'indra/newview/skins/default/textures/icons') diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg deleted file mode 100644 index 57204e2261..0000000000 Binary files a/indra/newview/skins/default/textures/icons/map_placeholder.jpg and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.png b/indra/newview/skins/default/textures/icons/map_placeholder.png new file mode 100644 index 0000000000..31e457aa75 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/map_placeholder.png differ -- cgit v1.2.3