From 6a02f5bbcec2b1a530ceeacb0dc564cfeb7cbc7f Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Fri, 11 Dec 2015 19:58:08 +0200 Subject: Initial version of Visual Outfit Browser --- indra/newview/skins/default/textures/textures.xml | 1 + 1 file changed, 1 insertion(+) (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 a5f2ce1f84..56def93ffe 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,4 +804,5 @@ with the same filename but different name + -- cgit v1.3 From 51945162d2f3cde29d698bfad47a2eeafcd86c76 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Thu, 25 Feb 2016 20:28:04 +0200 Subject: MAINT-5194 Visual Outfit Browser Сhanging default photo for outfit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/lloutfitgallery.cpp | 4 ---- .../default/textures/icons/Default_Outfit_Photo.jpg | Bin 0 -> 26604 bytes indra/newview/skins/default/textures/textures.xml | 2 +- .../skins/default/xui/en/panel_outfit_gallery_item.xml | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 9a7aa5e277..9f0c7cbbe3 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -578,10 +578,6 @@ void LLOutfitGalleryGearMenu::onUploadFoto() { gallery->uploadPhoto(selected_outfit_id); } - if (selected_outfit_id.notNull()) - { - - } } void LLOutfitGalleryGearMenu::onLoadAssets() diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg new file mode 100644 index 0000000000..c019174fd7 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 1b7b76e3b8..b1b82669a9 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,7 +804,7 @@ with the same filename but different name - + diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml index d8b0ecaf59..eede209e91 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml @@ -27,7 +27,7 @@ width="147" follows="left|top" visible="true" - image_name="Popup_Caution" + image_name="Default_Outfit_Photo" /> Date: Tue, 15 Mar 2016 18:20:41 +0200 Subject: MAINT-5194 Visual Outfit Browser Changed default outfit icon --- .../default/textures/icons/Default_Outfit_Photo.PNG | Bin 0 -> 15058 bytes .../default/textures/icons/Default_Outfit_Photo.jpg | Bin 26604 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG delete mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG new file mode 100644 index 0000000000..781454880a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG differ diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg deleted file mode 100644 index c019174fd7..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b1b82669a9..be23cbfeb7 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,7 +804,7 @@ with the same filename but different name - + -- cgit v1.3 From 7a49c07fcb914430cbe4905071b0b901033dd75a Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Wed, 16 Mar 2016 17:13:53 +0200 Subject: MAINT-5194 Visual Outfit Browser Attempt to fix issue with default outfit icon on Mac --- .../default/textures/icons/Default_Outfit_Photo.PNG | Bin 15058 -> 0 bytes .../textures/icons/Default_Outfit_Photo_renamed.png | Bin 0 -> 15058 bytes indra/newview/skins/default/textures/textures.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG create mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG deleted file mode 100644 index 781454880a..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.PNG and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png new file mode 100644 index 0000000000..781454880a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index be23cbfeb7..56a15fff42 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,7 +804,7 @@ with the same filename but different name - + -- cgit v1.3 From 824deea265614b649e074d4702e8f4bf071cef68 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Thu, 17 Mar 2016 19:25:23 +0200 Subject: MAINT-5194 Visual Outfit Browser Changed default outfit icon --- .../default/textures/icons/Default_Outfit_Photo.png | Bin 0 -> 19459 bytes .../textures/icons/Default_Outfit_Photo_renamed.png | Bin 15058 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png delete mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png new file mode 100644 index 0000000000..bacddcbb68 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.png differ diff --git a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png deleted file mode 100644 index 781454880a..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Default_Outfit_Photo_renamed.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 56a15fff42..be23cbfeb7 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,7 +804,7 @@ with the same filename but different name - + -- cgit v1.3 From ac1f29a73c8cdaa5bd7bdc47fd4d2157a879f304 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 31 Aug 2016 23:42:24 +0300 Subject: MAINT-6386 Update first-time Viewer Login screen with new LISI screenshots --- .../textures/windows/first_login_image_left.png | Bin 311306 -> 384997 bytes .../textures/windows/first_login_image_right.png | Bin 329170 -> 340188 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/windows/first_login_image_left.png b/indra/newview/skins/default/textures/windows/first_login_image_left.png index b405a88245..1fa10fde53 100644 Binary files a/indra/newview/skins/default/textures/windows/first_login_image_left.png and b/indra/newview/skins/default/textures/windows/first_login_image_left.png differ diff --git a/indra/newview/skins/default/textures/windows/first_login_image_right.png b/indra/newview/skins/default/textures/windows/first_login_image_right.png index 22a6dd8a53..d764d846b7 100644 Binary files a/indra/newview/skins/default/textures/windows/first_login_image_right.png and b/indra/newview/skins/default/textures/windows/first_login_image_right.png differ -- cgit v1.3