summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-02-25 20:28:04 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-02-25 20:28:04 +0200
commit51945162d2f3cde29d698bfad47a2eeafcd86c76 (patch)
tree0fce96008e43d9e8cc44cf5c7d86415340c4f9e3 /indra
parent42008625df1ffba699ee31413ac4c1893528a9dc (diff)
MAINT-5194 Visual Outfit Browser
Сhanging default photo for outfit
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lloutfitgallery.cpp4
-rw-r--r--indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpgbin0 -> 26604 bytes
-rwxr-xr-xindra/newview/skins/default/textures/textures.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml2
4 files changed, 2 insertions, 6 deletions
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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg
Binary files 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
<texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
<texture name="NavBar Separator" file_name="navbar/separator.png"/>
- <texture name="Outfit_Default_Foto" fileName="icons/pop_up_caution.png"/>
+ <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.jpg" preload="true"/>
<texture name="Notification_Condense" file_name="icons/Icon_Notification_Condense.png" preload="true"/>
<texture name="Notification_Expand" file_name="icons/Icon_Notification_Expand.png" preload="true"/>
<texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
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"
/>
<panel
background_visible="false"