SL-19479 Remove outfit photo preview and replace with a pop up

2 files changed, 11 insertions, 65 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
deleted file mode 100644
index bfc1c39e9d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="false"
- height="325"
- layout="topleft"
- name="outfit_photo_preview"
- help_topic="preview_texture"
- width="410">
-   <floater.string
-     name="Title">
-        Texture: [NAME]
-    </floater.string>
-    <floater.string
-     name="exceed_limits">
-        Max outfit photo size is [MAX_WIDTH]*[MAX_HEIGHT]. Please select another texture.
-    </floater.string>
-    <floater.string
-     name="photo_confirmation">
-         Set this as Outfit Photo for [OUTFIT]?
-    </floater.string>
-    <text
-     type="string"
-     halign="right"
-     length="1"
-     follows="right|bottom"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="dimensions"
-     top="255"
-     width="200">
-        [WIDTH]px x [HEIGHT]px
-    </text>
-    <text
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="notification"
-     left="25"
-     halign="center"
-     top_pad="5"
-     width="360">
-    </text>
-    <button
-     follows="right|bottom"
-     height="22"
-     label="OK"
-     layout="topleft"
-     name="ok_btn"
-     top_pad="5"
-     right="-115"
-     top_delta="0"
-     width="90" />
-    <button
-     follows="right|bottom"
-     height="22"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-20"
-     top_delta="0"
-     width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 73ce5a6096..e6f670aa39 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6155,6 +6155,17 @@ Are you sure you want to delete them?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="ThumbnailOutfitPhoto"
+   type="alertmodal">
+    <unique/>
+    To add an image to an outfit, use the Outfit Gallery window, or right-click on the outfit folder and select "Image..."
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
      type="alertmodal">