From 6a02f5bbcec2b1a530ceeacb0dc564cfeb7cbc7f Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 11 Dec 2015 19:58:08 +0200
Subject: Initial version of Visual Outfit Browser

---
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../skins/default/xui/en/floater_snapshot.xml      |   4 +-
 .../skins/default/xui/en/menu_outfit_gear.xml      |  16 ++-
 .../skins/default/xui/en/panel_outfit_gallery.xml  | 128 +++++++++++++++++++++
 .../default/xui/en/panel_outfit_gallery_item.xml   |  49 ++++++++
 .../default/xui/en/panel_outfits_inventory.xml     |  11 ++
 6 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml

(limited to 'indra/newview/skins/default')

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
   <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"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 76adaad57c..420aced6a2 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -406,7 +406,7 @@
 	width="400"
 	height="400"
     follows="top|left"/>
-  <view_border 
+  <!--view_border 
    bevel_style="in" 
    height="21"
    layout="topleft"
@@ -414,7 +414,7 @@
    top_pad="0"
    right="-10"
    follows="left|top|right"
-   left_delta="0"/>
+   left_delta="0"/>-->
    <text
     type="string"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 3b8ace6308..c970efbc03 100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -39,8 +39,22 @@
          function="Gear.OnVisible"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_call
+     label="Upload foto"
+     layout="topleft"
+     name="upload_foto">
+        <on_click
+         function="Gear.UploadFoto" />
+    </menu_item_call>
+    <menu_item_call
+     label="Load assets"
+     layout="topleft"
+     name="load_assets">
+        <on_click
+         function="Gear.LoadAssets" />
+    </menu_item_call>
 
-            <menu_item_separator name="sepatator1" />
+  <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
             <menu
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
new file mode 100644
index 0000000000..6146514f98
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   border="false"
+   follows="all"
+   height="430"
+   name="Outfit Gallery"
+   layout="topleft"
+   left="0"
+   top="0"
+   width="312">
+  <string name="outfit_foto_string">
+    Foto of "[OUTFIT_NAME]" outfit
+  </string>
+  <scroll_container
+   border="true"
+   bevel_style="none"
+   follows="all"
+   height="400"
+   width="312"
+   min_width="312"
+   layout="topleft"
+   left="4"
+   top="0"
+   name="gallery_scroll_panel"
+   opaque="false"
+   top_pad="0">
+   <panel
+   background_visible="true"
+   border="true"
+   bevel_style="none"
+	 follows="all"
+   height="560"
+   width="312"
+   layout="topleft"
+   top="0"
+   left="4"
+   top_pad="0"
+   visible="true"
+   name="gallery_panel">
+   <!--outfit_gallery_item
+    layout="topleft"
+    left="10"
+    name="preview_outfit1"
+    height="175"
+    width="150"
+    follows="left|top"/-->
+     <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+      </layout_panel>
+    </layout_stack>
+     <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
+       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
+         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
+       </layout_panel>
+       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+       </layout_panel>
+       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
+         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
+       </layout_panel>
+     </layout_stack-->
+   </panel>
+  </scroll_container>
+  <panel
+     background_visible="true"
+	 follows="bottom|left|right"
+	 height="28"
+	 layout="topleft"
+	 left="4"
+	 top_pad="0"
+	 visible="true"
+	 name="bottom_panel"
+	 width="312">
+     <menu_button
+       follows="bottom|left"
+       tool_tip="Show additional options"
+       height="25"
+       image_hover_unselected="Toolbar_Left_Over"
+       image_overlay="OptionsMenu_Off"
+       image_selected="Toolbar_Left_Selected"
+       image_unselected="Toolbar_Left_Off"
+       layout="topleft"
+       left="0"
+       name="options_gear_btn"
+       top="1"
+       width="31" />
+     <icon
+       follows="bottom|left|right"
+       height="25"
+       image_name="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="dummy_icon"
+       width="243"/>
+      <button
+       follows="bottom|right"
+       height="25"
+       image_hover_unselected="Toolbar_Right_Over"
+       image_overlay="TrashItem_Off"
+       image_selected="Toolbar_Right_Selected"
+       image_unselected="Toolbar_Right_Off"
+       layout="topleft"
+       left_pad="1"
+       name="trash_btn"
+       tool_tip="Delete selected outfit"
+       width="31"/>
+    </panel>
+</panel>
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
new file mode 100644
index 0000000000..acb72402cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="DkGray"
+   border="true"
+   bevel_style="none"
+   follows="left|top"
+   height="169"
+   width="149"
+   name="Outfit Gallery Item"
+   layout="topleft"
+   left="0"
+   top="0"
+   >
+  <icon
+      left="0"
+      top="0"
+      layout="topleft"
+      name="preview_outfit"
+      height="149"
+      width="149"
+      follows="left|top"
+      visible="true"
+      image_name="Popup_Caution"
+    />
+  <text
+    length="1"
+    follows="left|top"
+    left="1"
+    height="10"
+    layout="topleft"
+    name="outfit_name"
+    top="150"
+    width="150">
+    Summer hipster, Pierce
+  </text>
+  <text
+    length="1"
+    follows="left|top"
+    left="1"
+    height="10"
+    layout="topleft"
+    name="outfit_worn_text"
+    top="160"
+    width="150">
+    (worn)
+  </text>
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 405d9513db..ff0714adbb 100755
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -32,6 +32,17 @@
      halign="center"
      top="8"
      width="315">
+         <panel
+           class="outfit_gallery"
+           filename="panel_outfit_gallery.xml"
+           height="520"
+           name="outfit_gallery_tab"
+           background_visible="true"
+           help_topic="outfit_gallery_tab"
+           follows="all"
+           label="OUTFIT GALLERY"
+           layout="topleft"
+           width="315" />
          <panel
            class="outfits_list"
            filename="panel_outfits_list.xml"
-- 
cgit v1.2.3


From 749bb57cd19d51090d64cd2261048b9a0654807b Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 18 Dec 2015 19:20:32 +0200
Subject: MAINT-5194 Visual Outfit Browser Visual selection of outfit
 implemented

---
 .../default/xui/en/panel_outfit_gallery_item.xml   | 77 ++++++++++++++--------
 1 file changed, 48 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default')

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 acb72402cc..535960502e 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
@@ -1,49 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-   background_visible="true"
-   bg_alpha_color="DkGray"
-   border="true"
+   background_visible="false"
+   background_opaque="false"
+   bg_alpha_color="FrogGreen"
+   bg_opaque_color="FrogGreen"
+   border_color="Red"
+   border="false"
    bevel_style="none"
    follows="left|top"
    height="169"
-   width="149"
-   name="Outfit Gallery Item"
+   width="150"
+   name="gallery_item_panel"
    layout="topleft"
    left="0"
    top="0"
    >
   <icon
-      left="0"
+      left="1"
       top="0"
       layout="topleft"
       name="preview_outfit"
       height="149"
-      width="149"
+      width="147"
       follows="left|top"
       visible="true"
       image_name="Popup_Caution"
     />
-  <text
-    length="1"
-    follows="left|top"
-    left="1"
-    height="10"
-    layout="topleft"
-    name="outfit_name"
-    top="150"
-    width="150">
-    Summer hipster, Pierce
-  </text>
-  <text
-    length="1"
-    follows="left|top"
-    left="1"
-    height="10"
-    layout="topleft"
-    name="outfit_worn_text"
-    top="160"
-    width="150">
-    (worn)
-  </text>
+  <panel
+   background_visible="false"
+   background_opaque="true"
+   bg_opaque_color="FrogGreen"
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   left="0"
+   top="149"
+   height="25"
+   width="148"
+   name="text_bg_panel"
+   >
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="outfit_name"
+      top="0"
+      width="150">
+      Summer hipster, Pierce
+    </text>
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="10"
+      layout="topleft"
+      name="outfit_worn_text"
+      top="10"
+      width="150">
+      (worn)
+    </text>
+  </panel>
 
 </panel>
-- 
cgit v1.2.3


From 5d576df19047ec45070f6571ebcada26e5c20756 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Tue, 22 Dec 2015 20:27:19 +0200
Subject: MAINT-5194 Visual Outfit Browser 1)Added visual hilighting of worn
 outfit 2)Fixed colors  of selection borders to fit initial design

---
 indra/newview/skins/default/colors.xml                           | 9 +++++++++
 indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bdc884885f..1ee3d0ec0c 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -945,4 +945,13 @@
   <color
     name="SyntaxLslStringLiteral"
     value="1 0.14 0 1" />
+  <color
+    name="OutfitGalleryItemSelected"
+    value="0.22 0.45 0.35 1" />
+  <color
+    name="OutfitGalleryItemWorn"
+    value="0.33 0.58 0.47 1" />
+  <color
+    name="OutfitGalleryItemUnselected"
+    value="0.4 0.4 0.4 1" />
 </colors>
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 535960502e..7c3e93fdae 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
@@ -15,6 +15,9 @@
    left="0"
    top="0"
    >
+  <string name="worn_string">
+    (worn)
+  </string>
   <icon
       left="1"
       top="0"
@@ -29,7 +32,7 @@
   <panel
    background_visible="false"
    background_opaque="true"
-   bg_opaque_color="FrogGreen"
+   bg_opaque_color="OutfitGalleryItemSelected"
    border="false"
    bevel_style="none"
    follows="left|top"
-- 
cgit v1.2.3


From 81ecf0c0f304aef72f8b558c732b5ed62acfb946 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Wed, 27 Jan 2016 17:21:25 +0200
Subject: MAINT-5194 Visual Outfit Browser 1) Changed algorithm for building
 gallery, which fixed item cropping when switching between tabs in Appearance
 floater 2) Fixed gap between items in partially fille row

---
 .../newview/skins/default/xui/en/panel_outfit_gallery.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index 6146514f98..2a06b35942 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -26,19 +26,6 @@
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-   <panel
-   background_visible="true"
-   border="true"
-   bevel_style="none"
-	 follows="all"
-   height="560"
-   width="312"
-   layout="topleft"
-   top="0"
-   left="4"
-   top_pad="0"
-   visible="true"
-   name="gallery_panel">
    <!--outfit_gallery_item
     layout="topleft"
     left="10"
@@ -79,7 +66,7 @@
          <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
        </layout_panel>
      </layout_stack-->
-   </panel>
+    <!--</panel>-->
   </scroll_container>
   <panel
      background_visible="true"
-- 
cgit v1.2.3


From 12608244387c3247adb759f221da99eb823f53c4 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 5 Feb 2016 18:11:36 +0200
Subject: MAINT-5194 Visual Outfit Browser Corrected typo "foto" to "photo"

---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml     | 6 +++---
 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index c970efbc03..3132c4db8b 100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -40,11 +40,11 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Upload foto"
+     label="Upload Photo (L$10)"
      layout="topleft"
-     name="upload_foto">
+     name="upload_photo">
         <on_click
-         function="Gear.UploadFoto" />
+         function="Gear.UploadPhoto" />
     </menu_item_call>
     <menu_item_call
      label="Load assets"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index 2a06b35942..c06c6a86c3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -10,8 +10,8 @@
    left="0"
    top="0"
    width="312">
-  <string name="outfit_foto_string">
-    Foto of "[OUTFIT_NAME]" outfit
+  <string name="outfit_photo_string">
+    Photo of "[OUTFIT_NAME]" outfit
   </string>
   <scroll_container
    border="true"
-- 
cgit v1.2.3


From d52f05dc82c1849f07fd69be5e5fba2cbd1fa47a Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Thu, 18 Feb 2016 18:39:53 +0200
Subject: MAINT-5194 Visual Outfit Browser Changed to store uploaded photos as
 links in outfit folders

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index c06c6a86c3..682d2d0730 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -10,6 +10,9 @@
    left="0"
    top="0"
    width="312">
+  <string name="photo_upload_pending_string">
+    Photo upload pending...
+  </string>
   <string name="outfit_photo_string">
     Photo of "[OUTFIT_NAME]" outfit
   </string>
-- 
cgit v1.2.3


From c2bbd1fedd28df3283f087d391f52971e8139327 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 19 Feb 2016 20:47:57 +0200
Subject: MAINT-5194 Visual Outfit Browser Added creating links to photos via
 DragnDrop

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index 682d2d0730..c06c6a86c3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -10,9 +10,6 @@
    left="0"
    top="0"
    width="312">
-  <string name="photo_upload_pending_string">
-    Photo upload pending...
-  </string>
   <string name="outfit_photo_string">
     Photo of "[OUTFIT_NAME]" outfit
   </string>
-- 
cgit v1.2.3


From 42008625df1ffba699ee31413ac4c1893528a9dc Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Tue, 23 Feb 2016 19:13:33 +0200
Subject: MAINT-5194 Visual Outfit Browser Added ellipsis when outfit name is
 truncated to one line

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 7c3e93fdae..d8b0ecaf59 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
@@ -51,8 +51,9 @@
       layout="topleft"
       name="outfit_name"
       top="0"
-      width="150">
-      Summer hipster, Pierce
+      width="150"
+      use_ellipses="true">
+      Summer hipster, Pierce Pierce Pierce Pierce
     </text>
     <text
       read_only="true"
-- 
cgit v1.2.3


From 51945162d2f3cde29d698bfad47a2eeafcd86c76 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Thu, 25 Feb 2016 20:28:04 +0200
Subject: =?UTF-8?q?MAINT-5194=20Visual=20Outfit=20Browser=20=D0=A1hanging?=
 =?UTF-8?q?=20default=20photo=20for=20outfit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Default_Outfit_Photo.jpg

(limited to 'indra/newview/skins/default')

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
   <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"
-- 
cgit v1.2.3


From 7ca8e984be40e68c01d2b54092629d41b4df4e46 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 4 Mar 2016 19:41:01 +0200
Subject: MAINT-5194 Visual Outfit Browser 1) Made code clean-up 2) Removed
 constants in code via #define and introduced parametres which can ne set in
 XML instead 3) Made refactoring of some methods 4) Removed non-functional
 item "Load assets" from outfit gear-menu

---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 3132c4db8b..e31ff2a6e2 100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -46,13 +46,6 @@
         <on_click
          function="Gear.UploadPhoto" />
     </menu_item_call>
-    <menu_item_call
-     label="Load assets"
-     layout="topleft"
-     name="load_assets">
-        <on_click
-         function="Gear.LoadAssets" />
-    </menu_item_call>
 
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
-- 
cgit v1.2.3


From cb45000b837a1e04db91865c516b4b1c2b141d2f Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
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')

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
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 
-  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.jpg" preload="true"/>
+  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.png" 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"/>
-- 
cgit v1.2.3


From 7a49c07fcb914430cbe4905071b0b901033dd75a Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
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')

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
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 
-  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.png" preload="true"/>
+  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo_renamed.png" 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"/>
-- 
cgit v1.2.3


From 824deea265614b649e074d4702e8f4bf071cef68 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
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')

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
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
 
-  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo_renamed.png" preload="true"/>
+  <texture name="Default_Outfit_Photo" file_name="icons/Default_Outfit_Photo.png" 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"/>
-- 
cgit v1.2.3


From 808b8ed01849fc6e2cd5caba68843eebcadc5333 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Tue, 5 Apr 2016 17:44:53 +0300
Subject: MAINT-6228 Update Photo/Image Upload feature for Outfit Browser 1)
 Added "Select Photo" to outfit gear menu 2) Incorporated Texture Picker

---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e31ff2a6e2..23133d4f7c 100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -46,6 +46,13 @@
         <on_click
          function="Gear.UploadPhoto" />
     </menu_item_call>
+    <menu_item_call
+     label="Select Photo"
+     layout="topleft"
+     name="select_photo">
+        <on_click
+         function="Gear.SelectPhoto" />
+  </menu_item_call>
 
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
-- 
cgit v1.2.3


From 4125bebce7116e074aef664026b9ed33ffa9ca19 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Fri, 29 Apr 2016 20:28:11 +0300
Subject: MAINT-6226 Incorporate a customized Snapshot feature to Outfit
 Browser flow Initial version, further refactoring pending

---
 .../default/xui/en/floater_outfit_snapshot.xml     | 462 +++++++++++++++++++++
 .../skins/default/xui/en/menu_outfit_gear.xml      |   9 +-
 .../xui/en/panel_outfit_snapshot_inventory.xml     | 147 +++++++
 3 files changed, 617 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
new file mode 100644
index 0000000000..7b88b07ca6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ positioning="cascading"
+ legacy_header_height="18"
+ can_minimize="true"
+ can_resize="false"
+ can_close="true"
+ height="455"
+ layout="topleft"
+ name="outfit_snapshot"
+ single_instance="true"
+ help_topic="snapshot"
+ save_rect="true"
+ save_visibility="false"
+ title="OUTFIT SNAPSHOT"
+ width="624"
+ min_height="455">
+  <floater.string
+   name="unknown">
+    unknown
+  </floater.string>
+  <string
+   name="postcard_progress_str">
+    Sending Email
+  </string>
+  <string
+      name="facebook_progress_str">
+    Posting to Facebook
+  </string>
+  <string
+      name="profile_progress_str">
+    Posting
+  </string>
+  <string
+   name="inventory_progress_str">
+    Saving to Inventory
+  </string>
+  <string
+   name="local_progress_str">
+    Saving to Computer
+  </string>
+  <string
+        name="facebook_succeeded_str">
+    Image uploaded
+  </string>
+  <string
+        name="profile_succeeded_str">
+    Image uploaded
+  </string>
+  <string
+ 	 name="postcard_succeeded_str">
+    Email Sent!
+  </string>
+  <string
+ 	 name="inventory_succeeded_str">
+    Saved to Inventory!
+  </string>
+  <string
+ 	 name="local_succeeded_str">
+    Saved to Computer!
+  </string>
+  <string
+     name="facebook_failed_str">
+    Failed to upload image to your Facebook timeline.
+  </string>
+  <string
+     name="profile_failed_str">
+    Failed to upload image to your Profile Feed.
+  </string>
+  <string
+ 	 name="postcard_failed_str">
+    Failed to send email.
+  </string>
+  <string
+ 	 name="inventory_failed_str">
+    Failed to save to inventory.
+  </string>
+  <string
+ 	 name="local_failed_str">
+    Failed to save to computer.
+  </string>
+  <button
+     follows="left|top"
+     height="25"
+     image_overlay="Refresh_Off"
+	 image_hover_unselected="Toolbar_Middle_Over"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     image_overlay_alignment="left"
+     imgoverlay_label_space="5"
+	 pad_bottom="0"
+	 halign="left"
+     layout="topleft"
+     left="10"
+	 label="REFRESH"
+     name="new_snapshot_btn"
+     top_pad="26"
+     width="167" />
+	<button
+       follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   invisibility_control="AdvanceSnapshot"
+       height="25"
+	   is_toggle="true"
+       layout="topleft"
+	   image_hover_unselected="Toolbar_Middle_Over"
+	   image_selected="Toolbar_Middle_Off"
+	   image_unselected="Toolbar_Middle_Off"
+	   image_overlay="Conv_toolbar_expand"
+       name="retract_btn"
+       left_pad="1"
+	   top_delta="0"
+       width="31" />
+   <button
+       follows="left|top"
+	   control_name="AdvanceSnapshot"
+	   visibility_control="AdvanceSnapshot"
+       height="25"
+	   is_toggle="true"
+       layout="topleft"
+	   image_overlay="Conv_toolbar_collapse"
+	   image_hover_unselected="Toolbar_Middle_Over"
+	   image_selected="Toolbar_Middle_Off"
+	   image_unselected="Toolbar_Middle_Off"
+       name="extend_btn"
+       left_delta="0"
+	   top_delta="0"
+       width="31" />
+	<panel
+     height="154"
+     layout="topleft"
+	 follows="top|left"
+     left="0"
+     name="advanced_options_panel"
+     top_pad="-6"
+     width="210">
+        <view_border 
+         bevel_style="in"
+         follows="left|top|right" 
+         height="1"
+         left="10"
+         layout="topleft"
+         name="advanced_options_hr"
+         right="-1"
+         top_pad="5"
+         />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="layer_type_label"
+         top_pad="10"
+         width="100">
+            Capture:
+        </text>
+        <combo_box
+         follows="left|top|right"
+         height="23"
+         label="Image Layers"
+         layout="topleft"
+         left="30"
+         name="layer_types"
+         right="-2">
+            <combo_box.item
+             label="Colors"
+             name="Colors"
+             value="colors" />
+            <combo_box.item
+             label="Depth"
+             name="Depth"
+             value="depth" />
+        </combo_box>
+        <check_box
+         label="Interface"
+         layout="topleft"
+         left="30"
+		 height="16"
+         top_pad="8"
+         width="180"
+         name="ui_check" />
+        <check_box
+         label="HUDs"
+         layout="topleft"
+		 height="16"
+         left="30"
+         top_pad="1"
+         width="180"
+         name="hud_check" />
+        <check_box
+         label="Freeze frame (fullscreen)"
+         layout="topleft"
+		 height="16"
+         left="10"
+         top_pad="1"
+         width="180"
+         name="freeze_frame_check" />
+        <check_box
+         label="Auto-refresh"
+         layout="topleft"
+		 height="16"
+         left="10"
+         top_pad="1"
+         width="180"
+         name="auto_snapshot_check" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="filter_list_label"
+         top_pad="10"
+         width="50">
+            Filter:
+        </text>
+        <combo_box
+            control_name="PhotoFilters"
+            follows="left|right|top"
+            name="filters_combobox"
+            tool_tip="Image filters"
+            top_delta="-3"
+            left="50"
+			right="-1"
+            height="21"
+            width="135">
+            <combo_box.item
+            label="No Filter"
+            name="NoFilter"
+            value="NoFilter" />
+        </combo_box>
+		 <view_border 
+         bevel_style="in"
+         follows="left|top|right" 
+         height="1"
+         left="10"
+         layout="topleft"
+         name="advanced_options_hr"
+         right="-1"
+         top_pad="7"
+         />
+    </panel>
+ <!--
+	<panel_container
+     follows="left|top"
+     height="230"
+     layout="topleft"
+     left="0"
+     name="panel_container"
+     default_panel_name="panel_snapshot_options"
+     top_pad="10"
+     width="215">
+      <panel
+       class="llpanelsnapshotoptions"
+       filename="panel_snapshot_options.xml"
+       follows="all"
+       layout="topleft"
+       left="0"
+       name="panel_snapshot_options"
+       top="0" />
+      <panel
+       class="llpanelsnapshotprofile"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_profile"
+       filename="panel_snapshot_profile.xml" />
+      <panel
+       class="llpanelsnapshotpostcard"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_postcard"
+       filename="panel_snapshot_postcard.xml" />
+      -->
+  <!--panel
+       class="llpaneloutfitsnapshotinventory"
+       follows="all"
+       layout="topleft"
+       name="panel_outfit_snapshot_inventory"
+       filename="panel_snapshot_inventory.xml"-->
+      <panel
+        class="llpaneloutfitsnapshotinventory"
+        follows="left|top"
+        height="230"
+        layout="topleft"
+        left="0"
+        name="panel_outfit_snapshot_inventory"
+        filename="panel_outfit_snapshot_inventory.xml"
+        top_pad="10"
+        width="215"
+      />
+      <!--
+      <panel
+       class="llpanelsnapshotlocal"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_local"
+       filename="panel_snapshot_local.xml" />
+      </panel_container>
+-->
+	<view_border 
+         bevel_style="in"
+         follows="left|top" 
+         height="1"
+         left="10"
+         layout="topleft"
+         name="status_hr"
+         width="199"
+         top_pad="-16"/>
+	<panel
+       background_visible="false"
+       follows="left|top"
+       font="SansSerifLarge"
+       halign="center"
+       height="20"
+       layout="topleft"
+       left="10"
+       length="1"
+       name="succeeded_panel"
+	   width="198"
+       top_pad="1"
+       type="string"
+       visible="false">
+          <text
+           follows="all"
+           font="SansSerif"
+           halign="center"
+           height="18"
+           layout="topleft"
+           left="1"
+           length="1"
+           name="succeeded_lbl"
+           right="-1"
+           text_color="0.2 0.85 0.2 1"
+           top="4"
+           translate="false"
+           type="string">
+              Succeeded
+          </text>
+      </panel>
+      <panel
+       background_visible="false"
+       follows="left|top"
+       font="SansSerifLarge"
+       halign="center"
+       height="20"
+       layout="topleft"
+       left="10"
+       length="1"
+       name="failed_panel"
+	   width="198"
+       top_delta="0"
+       type="string"
+       visible="false">
+          <text
+           follows="all"
+           font="SansSerif"
+           halign="center"
+           height="18"
+           layout="topleft"
+           left="1"
+           length="1"
+           name="failed_lbl"
+           right="-1"
+           text_color="0.95 0.4 0.4 1"
+           top="4"
+           translate="false"
+           type="string">
+              Failed
+          </text>
+      </panel>
+      <loading_indicator
+       follows="left|top"
+       height="24"
+       layout="topleft"
+       name="working_indicator"
+       left="10"
+       top_delta="0"
+       visible="false"
+       width="24" />
+      <text
+       follows="left|top"
+       font="SansSerifBold"
+       height="14"
+       layout="topleft"
+       left_pad="3"
+       length="1"
+       halign="left"
+       name="working_lbl"
+       top_delta="5"
+       translate="false"
+       type="string"
+       visible="false"
+       width="162">
+          Working
+      </text>
+      <text
+       follows="left|top"
+       font="SansSerifBold"
+       halign="left"
+       height="18"
+       layout="topleft"
+       left="10"
+       length="1"
+       name="refresh_lbl"
+       text_color="0.95 0.4 0.4 1"
+       top_delta="0"
+       translate="false"
+       type="string"
+       visible="false"
+       width="130">
+          Refresh to save.
+      </text>
+  <ui_ctrl 
+    layout="topleft"
+    name="thumbnail_placeholder"
+    top="23"
+	left="215"
+	width="400"
+	height="400"
+    follows="top|left"/>
+  <!--view_border 
+   bevel_style="in" 
+   height="21"
+   layout="topleft"
+   name="img_info_border"
+   top_pad="0"
+   right="-10"
+   follows="left|top|right"
+   left_delta="0"/>-->
+   <text
+    type="string"
+    font="SansSerifSmall"
+    length="1"
+    follows="left|top|right"
+    height="14"
+    layout="topleft"
+    left="220"
+	right="-20"
+    halign="left"
+    name="image_res_text"
+    top_delta="5"
+    width="200">
+       [WIDTH]px (width) x [HEIGHT]px (height)
+   </text>
+   <text
+    follows="right|top"
+    font="SansSerifSmall"
+    height="14"
+    layout="topleft"
+    left="-65"
+    length="1"
+    halign="right"
+    name="file_size_label"
+    top_delta="0"
+    type="string"
+    width="50">
+       [SIZE] KB
+   </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 23133d4f7c..e527e1f901 100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -52,7 +52,14 @@
      name="select_photo">
         <on_click
          function="Gear.SelectPhoto" />
-  </menu_item_call>
+    </menu_item_call>
+    <menu_item_call
+     label="Take a Snapshot"
+     layout="topleft"
+     name="take_snapshot">
+        <on_click
+         function="Gear.TakeSnapshot" />
+    </menu_item_call>
 
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
new file mode 100644
index 0000000000..ce6309e2ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_outfit_snapshot_inventory"
+ width="490">
+    <icon
+     follows="top|left"
+     height="18"
+     image_name="Snapshot_Inventory"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="title_icon"
+     top="6"
+     width="18" />
+    <text
+     follows="top|left|right"
+     font="SansSerifBold"
+     height="14"
+     layout="topleft"
+     left_pad="12"
+     length="1"
+     name="title"
+     right="-10"
+     text_color="white"
+     type="string"
+     top_delta="3">
+        Inventory
+    </text>
+    <view_border 
+     bevel_style="in"
+     follows="left|top|right" 
+     height="1"
+     left="9"
+     layout="topleft"
+     name="hr"
+     right="-5"
+     top_pad="5"
+     />
+    <combo_box
+     follows="top|left|right"
+     height="20"
+     label="Resolution"
+     layout="topleft"
+     left_delta="0"
+     name="texture_size_combo"
+     right="-5"
+     top_pad="5">
+        <combo_box.item
+         label="Small (128x128)"
+         name="Small(128x128)"
+         value="[i128,i128]" />
+        <combo_box.item
+         label="Medium (256x256)"
+         name="Medium(256x256)"
+         value="[i256,i256]" />
+        <combo_box.item
+         label="Large (512x512)"
+         name="Large(512x512)"
+         value="[i512,i512]" />
+        <combo_box.item
+         label="Current Window(512x512)"
+         name="CurrentWindow"
+         value="[i0,i0]" />
+        <combo_box.item
+         label="Custom"
+         name="Custom"
+         value="[i-1,i-1]" />
+    </combo_box>
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label="Width x Height"
+     label_width="90"
+     layout="topleft"
+     left="10"
+     max_val="6016"
+     min_val="32"
+     name="inventory_snapshot_width"
+     top_pad="7"
+     width="144" />
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label=""
+     label_width="0"
+     layout="topleft"
+     left_pad="0"
+     max_val="6016"
+     min_val="32"
+     name="inventory_snapshot_height"
+     top_delta="0"
+     width="54" />
+    <check_box
+     top_pad="12"
+     follows="left|top"
+     label="Constrain proportions"
+     layout="topleft"
+     left="10"
+     name="inventory_keep_aspect_check"
+     visible="false" />
+    <text
+     follows="top|left"
+     font="SansSerif"
+     height="56"
+     layout="topleft"
+     left="10"
+     length="1"
+     name="hint_lbl"
+     top_pad="6"
+     width="200"
+     type="string"
+     word_wrap="true">
+        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+    </text>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     right="-5"
+     top="337"
+     width="97">
+      <button.commit_callback
+       function="Inventory.Cancel" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Save"
+     layout="topleft"
+     left="10"
+     name="save_btn"
+     top_delta="0"
+     width="97">
+      <button.commit_callback
+       function="Inventory.SaveOutfitPhoto" />
+    </button>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 0a73840dd8e350cd936b681c0cc5131905eb3b09 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 5 May 2016 16:30:41 +0300
Subject: MAINT-6381 Right click on Outfit Folder behavior

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 eede209e91..77c546c6e7 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
@@ -3,8 +3,7 @@
    background_visible="false"
    background_opaque="false"
    bg_alpha_color="FrogGreen"
-   bg_opaque_color="FrogGreen"
-   border_color="Red"
+   bg_opaque_color="FrogGreen"   
    border="false"
    bevel_style="none"
    follows="left|top"
-- 
cgit v1.2.3


From bdeeb6451fcfaabb826a6a8babe9f580643bc873 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 5 May 2016 16:32:12 +0300
Subject: MAINT-6381 Right click on Outfit Folder behavior

---
 .../default/xui/en/menu_gallery_outfit_tab.xml     | 246 +++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100755 indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
new file mode 100755
index 0000000000..b9e29788dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+    layout="topleft"
+    name="Outfit">
+    <menu_item_call
+        label="Wear - Replace Current Outfit"
+        layout="topleft"
+        name="wear_replace">
+        <on_click
+        function="Outfit.WearReplace" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="wear_replace" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="wear_replace" />
+    </menu_item_call>
+    <menu_item_call
+        label="Wear - Add to Current Outfit"
+        layout="topleft"
+        name="wear_add">
+        <on_click
+        function="Outfit.WearAdd" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="wear_add" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="wear_add" />
+    </menu_item_call>
+    <menu_item_call
+        label="Take Off - Remove from Current Outfit"
+        layout="topleft"
+        name="take_off">
+        <on_click
+        function="Outfit.TakeOff" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="take_off" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="take_off" />
+    </menu_item_call>
+    <menu_item_call
+        label="Upload Photo (L$10)"
+        layout="topleft"
+        name="upload_photo">
+        <on_click
+        function="Outfit.UploadPhoto" />
+    </menu_item_call>
+    <menu_item_call
+        label="Select Photo"
+        layout="topleft"
+        name="select_photo">
+        <on_click
+        function="Outfit.SelectPhoto" />
+    </menu_item_call>
+    <menu_item_call
+        label="Take a Snapshot"
+        layout="topleft"
+        name="take_snapshot">
+        <on_click
+        function="Outfit.TakeSnapshot" />
+    </menu_item_call>
+    
+    <menu_item_separator name="sepatator1" />
+    <menu
+        height="175"
+        label="New Clothes"
+        layout="topleft"
+        left_delta="0"
+        mouse_opaque="false"
+        name="New Clothes"
+        top_pad="514"
+        width="125">
+        <menu_item_call
+            label="New Shirt"
+            layout="topleft"
+            name="New Shirt">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="shirt" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Pants"
+            layout="topleft"
+            name="New Pants">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="pants" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Shoes"
+            layout="topleft"
+            name="New Shoes">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="shoes" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Socks"
+            layout="topleft"
+            name="New Socks">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="socks" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Jacket"
+            layout="topleft"
+            name="New Jacket">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="jacket" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Skirt"
+            layout="topleft"
+            name="New Skirt">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="skirt" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Gloves"
+            layout="topleft"
+            name="New Gloves">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="gloves" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Undershirt"
+            layout="topleft"
+            name="New Undershirt">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="undershirt" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Underpants"
+            layout="topleft"
+            name="New Underpants">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="underpants" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Alpha"
+            layout="topleft"
+            name="New Alpha">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="alpha" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Physics"
+            layout="topleft"
+            name="New Physics">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="physics" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Tattoo"
+            layout="topleft"
+            name="New Tattoo">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="tattoo" />
+        </menu_item_call>
+    </menu>
+    <menu
+        height="85"
+        label="New Body Parts"
+        layout="topleft"
+        left_delta="0"
+        mouse_opaque="false"
+        name="New Body Parts"
+        top_pad="514"
+        width="118">
+        <menu_item_call
+            label="New Shape"
+            layout="topleft"
+            name="New Shape">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="shape" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Skin"
+            layout="topleft"
+            name="New Skin">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="skin" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Hair"
+            layout="topleft"
+            name="New Hair">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="hair" />
+        </menu_item_call>
+        <menu_item_call
+            label="New Eyes"
+            layout="topleft"
+            name="New Eyes">
+            <menu_item_call.on_click
+            function="Outfit.Create"
+            parameter="eyes" />
+        </menu_item_call>
+    </menu>
+    <menu_item_separator name="sepatator2" />
+    <menu_item_call
+        label="Edit Outfit"
+        layout="topleft"
+        name="edit">
+        <on_click
+        function="Outfit.Edit" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+        label="Rename Outfit"
+        layout="topleft"
+        name="rename">
+        <on_click
+        function="Outfit.Rename" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+        label="Delete Outfit"
+        layout="topleft"
+        name="delete">
+        <on_click
+        function="Outfit.Delete" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
+    </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From 8b3f4ec5f58c1488ac7b3403a1a510a4977cebf6 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Thu, 5 May 2016 19:43:02 +0300
Subject: MAINT-6226 Incorporate a customized Snapshot feature to Outfit
 Browser flow Removed odd controls like custom resolution spinners etc

---
 .../default/xui/en/floater_outfit_snapshot.xml     | 63 ----------------------
 .../xui/en/panel_outfit_snapshot_inventory.xml     | 52 ++----------------
 2 files changed, 3 insertions(+), 112 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
index 7b88b07ca6..34f02e535f 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -156,23 +156,6 @@
          width="100">
             Capture:
         </text>
-        <combo_box
-         follows="left|top|right"
-         height="23"
-         label="Image Layers"
-         layout="topleft"
-         left="30"
-         name="layer_types"
-         right="-2">
-            <combo_box.item
-             label="Colors"
-             name="Colors"
-             value="colors" />
-            <combo_box.item
-             label="Depth"
-             name="Depth"
-             value="depth" />
-        </combo_box>
         <check_box
          label="Interface"
          layout="topleft"
@@ -243,43 +226,6 @@
          top_pad="7"
          />
     </panel>
- <!--
-	<panel_container
-     follows="left|top"
-     height="230"
-     layout="topleft"
-     left="0"
-     name="panel_container"
-     default_panel_name="panel_snapshot_options"
-     top_pad="10"
-     width="215">
-      <panel
-       class="llpanelsnapshotoptions"
-       filename="panel_snapshot_options.xml"
-       follows="all"
-       layout="topleft"
-       left="0"
-       name="panel_snapshot_options"
-       top="0" />
-      <panel
-       class="llpanelsnapshotprofile"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_profile"
-       filename="panel_snapshot_profile.xml" />
-      <panel
-       class="llpanelsnapshotpostcard"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_postcard"
-       filename="panel_snapshot_postcard.xml" />
-      -->
-  <!--panel
-       class="llpaneloutfitsnapshotinventory"
-       follows="all"
-       layout="topleft"
-       name="panel_outfit_snapshot_inventory"
-       filename="panel_snapshot_inventory.xml"-->
       <panel
         class="llpaneloutfitsnapshotinventory"
         follows="left|top"
@@ -291,15 +237,6 @@
         top_pad="10"
         width="215"
       />
-      <!--
-      <panel
-       class="llpanelsnapshotlocal"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_local"
-       filename="panel_snapshot_local.xml" />
-      </panel_container>
--->
 	<view_border 
          bevel_style="in"
          follows="left|top" 
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index ce6309e2ed..7261d429ba 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -59,53 +59,7 @@
          label="Large (512x512)"
          name="Large(512x512)"
          value="[i512,i512]" />
-        <combo_box.item
-         label="Current Window(512x512)"
-         name="CurrentWindow"
-         value="[i0,i0]" />
-        <combo_box.item
-         label="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
     </combo_box>
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label="Width x Height"
-     label_width="90"
-     layout="topleft"
-     left="10"
-     max_val="6016"
-     min_val="32"
-     name="inventory_snapshot_width"
-     top_pad="7"
-     width="144" />
-    <spinner
-     allow_text_entry="false"
-     decimal_digits="0"
-     follows="left|top"
-     height="20"
-     increment="32"
-     label=""
-     label_width="0"
-     layout="topleft"
-     left_pad="0"
-     max_val="6016"
-     min_val="32"
-     name="inventory_snapshot_height"
-     top_delta="0"
-     width="54" />
-    <check_box
-     top_pad="12"
-     follows="left|top"
-     label="Constrain proportions"
-     layout="topleft"
-     left="10"
-     name="inventory_keep_aspect_check"
-     visible="false" />
     <text
      follows="top|left"
      font="SansSerif"
@@ -118,7 +72,7 @@
      width="200"
      type="string"
      word_wrap="true">
-        Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+        Uploading an image to your inventory costs L$[UPLOAD_COST].
     </text>
     <button
      follows="right|bottom"
@@ -130,12 +84,12 @@
      top="337"
      width="97">
       <button.commit_callback
-       function="Inventory.Cancel" />
+       function="Inventory.SaveOutfitCancel" />
     </button>
     <button
      follows="left|bottom"
      height="23"
-     label="Save"
+     label="UPLOAD L$10"
      layout="topleft"
      left="10"
      name="save_btn"
-- 
cgit v1.2.3


From 6d4d58738c8f1703d4e821308f749a3ae577268c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 13 May 2016 18:17:29 +0300
Subject: MAINT-6395 Visual outfit browser snapshot window needs image size
 fixes

---
 .../xui/en/panel_outfit_snapshot_inventory.xml     | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index 7261d429ba..800faabc2a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -38,28 +38,6 @@
      right="-5"
      top_pad="5"
      />
-    <combo_box
-     follows="top|left|right"
-     height="20"
-     label="Resolution"
-     layout="topleft"
-     left_delta="0"
-     name="texture_size_combo"
-     right="-5"
-     top_pad="5">
-        <combo_box.item
-         label="Small (128x128)"
-         name="Small(128x128)"
-         value="[i128,i128]" />
-        <combo_box.item
-         label="Medium (256x256)"
-         name="Medium(256x256)"
-         value="[i256,i256]" />
-        <combo_box.item
-         label="Large (512x512)"
-         name="Large(512x512)"
-         value="[i512,i512]" />
-    </combo_box>
     <text
      follows="top|left"
      font="SansSerif"
-- 
cgit v1.2.3


From d1b7deda45f778e0fcfb92f38f9f5694ab285d1c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 31 May 2016 18:04:05 +0300
Subject: MAINT-6452 No message is displayed when there is no outfits in
 Gallery

---
 .../skins/default/xui/en/panel_outfit_gallery.xml  | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index c06c6a86c3..9a547f615d 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -13,6 +13,26 @@
   <string name="outfit_photo_string">
     Photo of "[OUTFIT_NAME]" outfit
   </string>
+  <string name="no_outfits_msg">
+    You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]
+  </string>
+  <string name="no_matched_outfits_msg">
+    Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].
+  </string>
+  <text
+    type="string"
+    clip_partial="false"
+    follows="left|top"
+    layout="topleft"
+    left="13"
+    name="no_outfits_txt"
+    top="0"
+    height="32"
+    valign="center"
+    parse_urls="true"
+    wrap="true">
+    Searching...
+  </text> 
   <scroll_container
    border="true"
    bevel_style="none"
@@ -66,8 +86,8 @@
          <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
        </layout_panel>
      </layout_stack-->
-    <!--</panel>-->
-  </scroll_container>
+    <!--</panel>-->  
+  </scroll_container> 
   <panel
      background_visible="true"
 	 follows="bottom|left|right"
-- 
cgit v1.2.3


From 3959d7b83f1fdca7d8daf5494dbc02a645cb868f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 3 Jun 2016 14:57:52 +0300
Subject: MAINT-6471 FIXED Side scroll bar cut off

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index 9a547f615d..c1272c6bf8 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -9,7 +9,7 @@
    layout="topleft"
    left="0"
    top="0"
-   width="312">
+   width="318">
   <string name="outfit_photo_string">
     Photo of "[OUTFIT_NAME]" outfit
   </string>
-- 
cgit v1.2.3


From 3cbab4d820963565c23f72e0bb6efd519c97462d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 6 Jun 2016 16:47:09 +0300
Subject: MAINT-6474 FIXED No easy way to remove an image from a VOB Folder

---
 .../newview/skins/default/xui/en/menu_gallery_outfit_tab.xml  | 11 ++++++++++-
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml       |  8 +++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index b9e29788dc..1b08767edc 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -62,7 +62,16 @@
         <on_click
         function="Outfit.TakeSnapshot" />
     </menu_item_call>
-    
+    <menu_item_call
+        label="Remove Photo"
+        layout="topleft"
+        name="remove_photo">
+        <on_click
+        function="Outfit.RemovePhoto" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="remove_photo" />
+    </menu_item_call>
     <menu_item_separator name="sepatator1" />
     <menu
         height="175"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e527e1f901..6b8a784560 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -60,7 +60,13 @@
         <on_click
          function="Gear.TakeSnapshot" />
     </menu_item_call>
-
+    <menu_item_call
+     label="Remove Photo"
+     layout="topleft"
+     name="remove_photo">
+        <on_click
+         function="Gear.RemovePhoto" />
+    </menu_item_call>
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
-- 
cgit v1.2.3


From e9e6862513476f83734d9edb7da79d2a009f1c4a Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Mon, 6 Jun 2016 17:18:48 +0300
Subject: MAINT-6465 FIXED Snapshop "file size" is split apart and looks bad

---
 .../default/xui/en/floater_outfit_snapshot.xml     | 52 +---------------------
 .../skins/default/xui/en/floater_snapshot.xml      |  4 +-
 2 files changed, 4 insertions(+), 52 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
index 34f02e535f..5941471907 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -19,66 +19,18 @@
    name="unknown">
     unknown
   </floater.string>
-  <string
-   name="postcard_progress_str">
-    Sending Email
-  </string>
-  <string
-      name="facebook_progress_str">
-    Posting to Facebook
-  </string>
-  <string
-      name="profile_progress_str">
-    Posting
-  </string>
   <string
    name="inventory_progress_str">
     Saving to Inventory
   </string>
-  <string
-   name="local_progress_str">
-    Saving to Computer
-  </string>
-  <string
-        name="facebook_succeeded_str">
-    Image uploaded
-  </string>
-  <string
-        name="profile_succeeded_str">
-    Image uploaded
-  </string>
-  <string
- 	 name="postcard_succeeded_str">
-    Email Sent!
-  </string>
   <string
  	 name="inventory_succeeded_str">
     Saved to Inventory!
   </string>
-  <string
- 	 name="local_succeeded_str">
-    Saved to Computer!
-  </string>
-  <string
-     name="facebook_failed_str">
-    Failed to upload image to your Facebook timeline.
-  </string>
-  <string
-     name="profile_failed_str">
-    Failed to upload image to your Profile Feed.
-  </string>
-  <string
- 	 name="postcard_failed_str">
-    Failed to send email.
-  </string>
   <string
  	 name="inventory_failed_str">
     Failed to save to inventory.
   </string>
-  <string
- 	 name="local_failed_str">
-    Failed to save to computer.
-  </string>
   <button
      follows="left|top"
      height="25"
@@ -358,7 +310,7 @@
 	width="400"
 	height="400"
     follows="top|left"/>
-  <!--view_border 
+  <view_border 
    bevel_style="in" 
    height="21"
    layout="topleft"
@@ -366,7 +318,7 @@
    top_pad="0"
    right="-10"
    follows="left|top|right"
-   left_delta="0"/>-->
+   left_delta="0"/>
    <text
     type="string"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 420aced6a2..76adaad57c 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -406,7 +406,7 @@
 	width="400"
 	height="400"
     follows="top|left"/>
-  <!--view_border 
+  <view_border 
    bevel_style="in" 
    height="21"
    layout="topleft"
@@ -414,7 +414,7 @@
    top_pad="0"
    right="-10"
    follows="left|top|right"
-   left_delta="0"/>-->
+   left_delta="0"/>
    <text
     type="string"
     font="SansSerifSmall"
-- 
cgit v1.2.3


From 9adf2dbeb7e7dcc1d3b4188899b58c089f4d99c8 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 9 Jun 2016 17:40:38 +0300
Subject: MAINT-6472 Show outfit tooltips in Outfit Gallery. Increase space
 between image and outfit name.

---
 indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

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 77c546c6e7..e3f0f1128b 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
@@ -49,7 +49,7 @@
       height="10"
       layout="topleft"
       name="outfit_name"
-      top="0"
+      top="2"
       width="150"
       use_ellipses="true">
       Summer hipster, Pierce Pierce Pierce Pierce
@@ -62,7 +62,7 @@
       height="10"
       layout="topleft"
       name="outfit_worn_text"
-      top="10"
+      top="12"
       width="150">
       (worn)
     </text>
-- 
cgit v1.2.3


From 554db00bdf20692f58c3eb42b83731011e9ad119 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 10 Jun 2016 18:04:16 +0300
Subject: MAINT-6475 Add menu item for changing sort priority

---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 6b8a784560..7faa4f3d71 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -261,4 +261,15 @@
          function="Gear.OnVisible"
          parameter="delete" />
     </menu_item_call>
+    <menu_item_separator name="sepatator3" />
+    <menu_item_check
+     label="Sort Folders Always by Name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Gear.SortByName" />
+        <on_check
+         function="CheckControl"
+         parameter="OutfitGallerySortByName" />
+    </menu_item_check>
 </toggleable_menu>
-- 
cgit v1.2.3


From 9c7b7d13c7e9c0c2376c90d94a60962608fe979d Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Mon, 18 Jul 2016 19:54:00 +0300
Subject: MAINT-6476 VOB - User can add any size image to an Outfit Gallery
 outfit folders Added restriction of image size that can be added to outfit

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 492d963653..f96b8636f5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11016,4 +11016,16 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
   
+  
+  <notification
+   icon="alert.tga"
+   name="ImageLoadError"
+   type="alertmodal">
+   [REASON]
+    <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 7187ec75a7095ab7bf1d49896d2f4f72b7899243 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Tue, 26 Jul 2016 19:18:03 +0300
Subject: MAINT-6476 VOB - User can add any size image to an Outfit Gallery
 outfit folders Added restriction of image size that can be added to outfit
 via "Select Photo"

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 indra/newview/skins/default/xui/en/strings.xml       | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f96b8636f5..bb9c767f2b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11019,9 +11019,9 @@ Cannot create large prims that intersect other players.  Please re-try when othe
   
   <notification
    icon="alert.tga"
-   name="ImageLoadError"
+   name="OutfitPhotoLoadError"
    type="alertmodal">
-   [REASON]
+    [REASON]
     <tag>fail</tag>
     <usetemplate
      name="okbutton"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ae63546082..17bb9a9e43 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3806,6 +3806,9 @@ Abuse Report</string>
 
   <string name="DefaultMimeType">none/none</string>
   <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
+  <string name="outfit_photo_load_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please resize or use another image</string>
+  <string name="outfit_photo_select_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please select another texture</string>
+  <string name="outfit_photo_verify_dimensions_error">Cannot verify photo dimensions. Please wait until photo size is displayed in picker</string>
 
   <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
   <string name="sentences_separator" value=" "></string>
-- 
cgit v1.2.3


From ac1f29a73c8cdaa5bd7bdc47fd4d2157a879f304 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
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')

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.2.3


From 81b683f83b759e78d1e0b598e412d86991791d39 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 1 Sep 2016 16:40:41 +0300
Subject: MAINT-6686 FIXED [VOB] Outfit Snapshot floater should be resized
 independently of general Snapshot floater

---
 indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
index 5941471907..15c480f144 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -50,8 +50,8 @@
      width="167" />
 	<button
        follows="left|top"
-	   control_name="AdvanceSnapshot"
-	   invisibility_control="AdvanceSnapshot"
+	   control_name="AdvanceOutfitSnapshot"
+	   invisibility_control="AdvanceOutfitSnapshot"
        height="25"
 	   is_toggle="true"
        layout="topleft"
@@ -65,8 +65,8 @@
        width="31" />
    <button
        follows="left|top"
-	   control_name="AdvanceSnapshot"
-	   visibility_control="AdvanceSnapshot"
+	   control_name="AdvanceOutfitSnapshot"
+	   visibility_control="AdvanceOutfitSnapshot"
        height="25"
 	   is_toggle="true"
        layout="topleft"
-- 
cgit v1.2.3