From 5c4ae5b11a44ab4711f0148cb721f35be9f18100 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 23 Feb 2017 17:50:36 -0500
Subject: STORM-2145 Camera Presets -- some initial work

---
 .../skins/default/textures/icons/Presets_Icon.png        | Bin 366 -> 0 bytes
 .../skins/default/textures/icons/Presets_Icon_Camera.png | Bin 0 -> 1381 bytes
 .../default/textures/icons/Presets_Icon_Graphic.png      | Bin 0 -> 366 bytes
 indra/newview/skins/default/textures/textures.xml        |   3 ++-
 4 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon.png
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png

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

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
deleted file mode 100644
index 5a6628816b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Presets_Icon.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
new file mode 100644
index 0000000000..8cb51cdc8e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png differ
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png
new file mode 100644
index 0000000000..5a6628816b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f2da22256c..de9ed4d479 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -205,7 +205,8 @@ with the same filename but different name
 
   <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
 
-  <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
+  <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
+  <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" />
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
-- 
cgit v1.2.3


From 32f16633c77564d567ed0752e56eb38abb916ccd Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 11 Jan 2018 18:35:35 -0500
Subject: STORM-2145 A few small changes

---
 .../skins/default/textures/icons/Presets_Icon_Camera.png | Bin 1381 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml        |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png

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

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
deleted file mode 100644
index 8cb51cdc8e..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index de9ed4d479..bc2abd0c02 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -98,7 +98,7 @@ with the same filename but different name
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
-  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="false" />
+  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="true" />
   <texture name="Cam_FreeCam_Off" file_name="bottomtray/Cam_FreeCam_Off.png" preload="false" />
   <texture name="Cam_Orbit_Off" file_name="bottomtray/Cam_Orbit_Off.png" preload="false" />
   <texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" />
@@ -206,7 +206,6 @@ with the same filename but different name
   <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
 
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
-  <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" />
 
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
-- 
cgit v1.2.3


From bf5ee32838b9d4c53ff1ab709e2935d8d0b4ec0b Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 8 Nov 2019 16:47:11 +0200
Subject: SL-12186 WIP Add new icons

---
 .../skins/default/textures/icons/Presets_Icon.png        | Bin 0 -> 1293 bytes
 indra/newview/skins/default/textures/textures.xml        |   2 ++
 .../newview/skins/default/textures/windows/Icon_Gear.png | Bin 0 -> 6229 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon.png
 create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear.png

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

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png
new file mode 100644
index 0000000000..503ee892a5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Presets_Icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 40f1d8b88f..b086f7dfa8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -206,6 +206,7 @@ with the same filename but different name
 
   <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
 
+  <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
  <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
@@ -256,6 +257,7 @@ with the same filename but different name
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
   <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" />
+  <texture name="Icon_Gear" file_name="windows/Icon_Gear.png" preload="false" />
 
   <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="true" />
   <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear.png b/indra/newview/skins/default/textures/windows/Icon_Gear.png
new file mode 100644
index 0000000000..e1e89b8f32
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Icon_Gear.png differ
-- 
cgit v1.2.3


From f4d4fb2ad0927ebb8545bac1abd1b74918a006f5 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 22 Nov 2019 14:34:20 +0200
Subject: SL-12288 Enhancement for Rotate and Track camera controls

---
 .../default/textures/bottomtray/Cam_Rotate_Center.png   | Bin 0 -> 10689 bytes
 .../default/textures/bottomtray/Cam_Tracking_Center.png | Bin 0 -> 1714 bytes
 indra/newview/skins/default/textures/textures.xml       |   2 ++
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
 create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png

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

diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
new file mode 100644
index 0000000000..ffc3c85ea2
Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
new file mode 100644
index 0000000000..2812d614e6
Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b086f7dfa8..2a4171f11b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -113,8 +113,10 @@ with the same filename but different name
 
   <texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
   <texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
+  <texture name="Cam_Rotate_Center" file_name="bottomtray/Cam_Rotate_Center.png" preload="false" />
   <texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />
   <texture name="Cam_Tracking_Out" file_name="bottomtray/Cam_Tracking_Out.png" preload="false" />
+  <texture name="Cam_Tracking_Center" file_name="bottomtray/Cam_Tracking_Center.png" preload="false" />
 
   <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" />
   <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" />
-- 
cgit v1.2.3