Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer

# Conflicts: # indra/newview/skins/default/colors.xml
2022-12-13 18:05:57 +01:00 · 2022-12-13 18:05:57 +01:00 · 01517fd847
parent 15f55c0a88 a783d6c02e
commit 01517fd847
2 changed files with 5 additions and 7 deletions
--- a/indra/edit-me-to-trigger-new-build.txt
+++ b/indra/edit-me-to-trigger-new-build.txt
@ -1,4 +1,2 @@
-euclid 5/29/2020
-euclid 7/23/2020
-euclid 4/29/2021
-euclid 10/5/2021 DRTVWR-546
+
+
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@ -1274,15 +1274,15 @@
  <color
    name="PanelGray"
    value="0.27 0.27 0.27 1" />
+  <color
+    name="PerformanceMid"
+    value="1 0.8 0 1" />
  <color
    name="OutfitSnapshotMacMask"
    value="0.115 0.115 0.115 1"/>
 <color
   name="OutfitSnapshotMacMask2"
   value="0.1 0.1 0.1 1"/>
-  <color
-    name="PerformanceMid"
-    value="1 0.8 0 1" />

  <!-- <FS:CR> Script Editor Colors -->
  <color