Merge remote-tracking branch 'refs/remotes/origin/main'

* refs/remotes/origin/main:
  new icons again
  New icons: Sharpened
  Jolly Roger macOS icon by Secret Foxtail
  New icons: revision
  New icon: 1024x1024
  New icons
  Blufault colors.xml: revert HTMLLinkColor
  New freebsd.png
  Blufault colors.xml
  Making FrogGreen blue
  Blufault: Camera & movement controls

23 files changed, 13 insertions, 12 deletions

diff --git a/indra/newview/icons/hicolor/1024x1024/apps/megapahit.png b/indra/newview/icons/hicolor/1024x1024/apps/megapahit.png
new file mode 100644
index 0000000000..2a998ab14c
--- /dev/null
+++ b/indra/newview/icons/hicolor/1024x1024/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/128x128/apps/megapahit.png b/indra/newview/icons/hicolor/128x128/apps/megapahit.png
index f2cc7c9c95..992b5b8e42 100644
--- a/indra/newview/icons/hicolor/128x128/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/128x128/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/256x256/apps/megapahit.png b/indra/newview/icons/hicolor/256x256/apps/megapahit.png
index f3edb632f0..12e95db18b 100644
--- a/indra/newview/icons/hicolor/256x256/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/256x256/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/48x48/apps/megapahit.png b/indra/newview/icons/hicolor/48x48/apps/megapahit.png
index d7ea1bf96d..8cf8426133 100644
--- a/indra/newview/icons/hicolor/48x48/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/48x48/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/512x512/apps/megapahit.png b/indra/newview/icons/hicolor/512x512/apps/megapahit.png
index 32c4205525..1ff521eef5 100644
--- a/indra/newview/icons/hicolor/512x512/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/512x512/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/64x64/apps/megapahit.png b/indra/newview/icons/hicolor/64x64/apps/megapahit.png
index 1bbe0a7687..43c74a2494 100644
--- a/indra/newview/icons/hicolor/64x64/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/64x64/apps/megapahit.png
diff --git a/indra/newview/icons/hicolor/96x96/apps/megapahit.png b/indra/newview/icons/hicolor/96x96/apps/megapahit.png
index 59f78d3ad1..e0f24f9cdf 100644
--- a/indra/newview/icons/hicolor/96x96/apps/megapahit.png
+++ b/indra/newview/icons/hicolor/96x96/apps/megapahit.png
diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
index be7aef24d0..5042885ada 100644
--- a/indra/newview/secondlife.icns
+++ b/indra/newview/secondlife.icns
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index f8f6d44e08..64c61ff278 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -4,13 +4,13 @@
 	<!-- Named Colors -->
 	<color
 	 name="EmphasisColor"
-	 value="0.4 0.6 0.8 1" />
+	 value="0.34 0.51 0.64 1" />
 	<color
 	 name="EmphasisColor_13"
-	 value="0.4 0.6 0.8 0.25" />
+	 value="0.34 0.51 0.64 0.13" />
 	<color
 	 name="EmphasisColor_35"
-	 value="0.4 0.6 0.8 0.42" />
+	 value="0.34 0.51 0.64 0.35" />
 	<color
 	 name="BeaconColor"
     value="0.749 0.298 0 1" />	 
@@ -70,7 +70,8 @@
 	 value="0 0 0 0.5" />
 	<color
 	name="FrogGreen"
-	value="0.26 0.345 0.263 1" />
+	value="0.26 0.33 0.42 1" />
+  <!-- ^(Not actually green) -->
 	<color
 	 name="Red"
 	 value="1 0 0 1" />
@@ -338,7 +339,7 @@
      reference="EmphasisColor" />
     <color
      name="ConversationFriendColor"
-     value="0.5 0.75 0.9 1" />
+     value="0.5 0.7 0.85 1" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -359,7 +360,7 @@
      reference="Black" />
     <color
      name="FilterTextColor"
-     value="0.38 0.69 0.79 1" />
+     reference="EmphasisColor" />
      <color
      name="FloaterButtonImageColor"
      reference="LtGray" />
@@ -407,7 +408,7 @@
      value="0.43 0.06 0.06 1" />
     <color
      name="HTMLLinkColor"
-     value="0.25 0.5 0.7 1" />
+     reference="EmphasisColor" />
     <color
      name="HealthTextColor"
      reference="White" />
@@ -437,7 +438,7 @@
      value="1 0 1 1" />
     <color
      name="HighlightParentColor"
-     value="0.67 0.83 0.96 1" />
+     value="0.5 0.65 0.8 1" />
     <color
      name="IMHistoryBgColor"
      reference="Unused?" />
@@ -506,7 +507,7 @@
      reference="White" />
     <color
      name="MapAvatarFriendColor"
-     value="0.5 0.75 0.9 1" />
+     value="0.5 0.7 0.85 1" />
     <color
      name="MapAvatarSelfColor"
      value="0.53125 0 0.498047 1" />
@@ -592,7 +593,7 @@
      reference="White" />
     <color
      name="NameTagFriend"
-     value="0.45 0.75 0.9 1" />
+     value="0.5 0.7 0.85 1" />
     <color
      name="NameTagLegacy"
      reference="White" />
@@ -640,7 +641,7 @@
      reference="DkGray_66" />
     <color
      name="ObjectChatColor"
-     reference="EmphasisColor" />
+     reference="LtYellow" />
     <color
      name="OverdrivenColor"
      reference="Red" />
@@ -838,7 +839,7 @@
      reference="White" />
     <color
      name="llOwnerSayChatColor"
-     reference="LtYellow" />
+     reference="LtOrange" />
 
     <!-- New Colors -->
     <color
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
index 4c62d142ba..90389734e5 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
index 46192c884e..a540674662 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
index c18894217b..a507127fda 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
index c9837b6757..61b1085e96 100644
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
index 193b55068b..1af8e6b956 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
index 222aaadf45..4f97611db1 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
index 500bf15543..f01c9f3c63 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
index 039299c8ed..a120d46e99 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
index 8164072e5a..c241ac75df 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
index 331755f384..20ce7b9296 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
index 5c2f6829b2..7b3d2e8dd8 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
index e3592f71f7..ecce0d0192 100644
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
diff --git a/indra/newview/skins/default/textures/windows/login_mp_logo.png b/indra/newview/skins/default/textures/windows/login_mp_logo.png
index c59a8b49fb..01c5e58e00 100644
--- a/indra/newview/skins/default/textures/windows/login_mp_logo.png
+++ b/indra/newview/skins/default/textures/windows/login_mp_logo.png
diff --git a/indra/newview/skins/default/textures/windows/login_mp_logo_small.png b/indra/newview/skins/default/textures/windows/login_mp_logo_small.png
index eeb513a917..cb67b946d3 100644
--- a/indra/newview/skins/default/textures/windows/login_mp_logo_small.png
+++ b/indra/newview/skins/default/textures/windows/login_mp_logo_small.png