From c16591c046fa76fc5d13387efa3bcaec3422e593 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 12 Feb 2010 16:12:12 -0800 Subject: Per-avatar customizable icons next to name links in text Changed LLUrlEntryAgent callbacks to handle both link label and icon Eliminated legacy LLNameCache file loading Reviewed with Kelly --- .../skins/default/textures/icons/Person_Check.png | Bin 0 -> 3824 bytes .../newview/skins/default/textures/icons/Person_Star.png | Bin 0 -> 3762 bytes indra/newview/skins/default/textures/textures.xml | 2 ++ 3 files changed, 2 insertions(+) create mode 100644 indra/newview/skins/default/textures/icons/Person_Check.png create mode 100644 indra/newview/skins/default/textures/icons/Person_Star.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Person_Check.png b/indra/newview/skins/default/textures/icons/Person_Check.png new file mode 100644 index 0000000000..f8638540d4 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Person_Check.png differ diff --git a/indra/newview/skins/default/textures/icons/Person_Star.png b/indra/newview/skins/default/textures/icons/Person_Star.png new file mode 100644 index 0000000000..ad10580ac4 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Person_Star.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 18d1779702..753f62dc8d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -410,6 +410,8 @@ with the same filename but different name + + -- cgit v1.2.3 From 0ee6a6025cba2f63c5c33c20870f67afd62f6372 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 10 Mar 2010 15:41:30 -0800 Subject: Name tag color and position hackery for demo --- indra/newview/skins/default/textures/Rounded_Rect.png | Bin 0 -> 338 bytes indra/newview/skins/default/textures/textures.xml | 1 + 2 files changed, 1 insertion(+) create mode 100644 indra/newview/skins/default/textures/Rounded_Rect.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/Rounded_Rect.png b/indra/newview/skins/default/textures/Rounded_Rect.png new file mode 100644 index 0000000000..c270c28039 Binary files /dev/null and b/indra/newview/skins/default/textures/Rounded_Rect.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 3b08408661..82bce8c069 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -458,6 +458,7 @@ with the same filename but different name + -- cgit v1.2.3 From f96376cba49517d0aadd10ac95244065c454d4d5 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 29 Mar 2010 17:46:06 -0700 Subject: Buy arrow, home tab, SL Logo binary art lost in merge --- indra/newview/skins/default/textures/icons/SL_Logo.png | Bin 973 -> 3999 bytes .../skins/default/textures/navbar/BuyArrow_Over.png | Bin 508 -> 294 bytes .../skins/default/textures/navbar/BuyArrow_Press.png | Bin 2949 -> 294 bytes .../default/textures/taskpanel/TabIcon_Home_Off.png | Bin 228 -> 749 bytes .../textures/taskpanel/TabIcon_Home_Selected.png | Bin 291 -> 790 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png index c9fbde987a..8342d7cfee 100644 Binary files a/indra/newview/skins/default/textures/icons/SL_Logo.png and b/indra/newview/skins/default/textures/icons/SL_Logo.png differ diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png index 95913dd55b..0b3f252ccf 100644 Binary files a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png and b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png differ diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png index a02675502a..5c4c150bed 100644 Binary files a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png and b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png differ diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png index 1e7d7beafa..421f5e1705 100644 Binary files a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png and b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Off.png differ diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png index a70d3abbbf..293aeef5e6 100644 Binary files a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png and b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png differ -- cgit v1.2.3 From fd2d23aa2c1f726dc522bbc268a92de5ee649f79 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 12 May 2010 11:58:27 -0700 Subject: Delete textures/xui files incorrectly added back during last merge --- .../skins/default/textures/icons/Generic_Group_Large.png | Bin 2282 -> 0 bytes indra/newview/skins/default/textures/locked_image.j2c | Bin 6140 -> 0 bytes indra/newview/skins/default/textures/map_infohub.tga | Bin 1068 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 indra/newview/skins/default/textures/icons/Generic_Group_Large.png delete mode 100644 indra/newview/skins/default/textures/locked_image.j2c delete mode 100644 indra/newview/skins/default/textures/map_infohub.tga (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 deleted file mode 100644 index 4d4f1e1bee..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c deleted file mode 100644 index 9e8998d675..0000000000 Binary files a/indra/newview/skins/default/textures/locked_image.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga deleted file mode 100644 index 545b8e532c..0000000000 Binary files a/indra/newview/skins/default/textures/map_infohub.tga and /dev/null differ -- cgit v1.2.3 From 816d5201be3e6fc8deefbbd21b14cb3a8724e235 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Fri, 24 Sep 2010 15:18:02 -0700 Subject: Adding copy to clipboard button for display names in profile panel --- indra/newview/skins/default/textures/icons/Copy.png | Bin 0 -> 481 bytes indra/newview/skins/default/textures/textures.xml | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/icons/Copy.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Copy.png b/indra/newview/skins/default/textures/icons/Copy.png new file mode 100644 index 0000000000..d45134e9dd Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Copy.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 35309cbaf8..d7375806a9 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -110,7 +110,8 @@ with the same filename but different name - + + -- cgit v1.2.3