Merge downstream code and viewer-beta

36 files changed, 0 insertions, 0 deletions

diff --git a/indra/newview/app_settings/windlight/skies/A%2D12AM.xml b/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
index 0aba31214a..0aba31214a 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D12PM.xml b/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
index 119b3e1418..119b3e1418 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D3AM.xml b/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
index f790d3d961..f790d3d961 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D3PM.xml b/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
index ec9706773e..ec9706773e 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D6AM.xml b/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
index bbc7aeec59..bbc7aeec59 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
index ebf08e1a3f..ebf08e1a3f 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D9AM.xml b/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
index 413e3a27d9..413e3a27d9 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
diff --git a/indra/newview/app_settings/windlight/skies/A%2D9PM.xml b/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
index 292f6713b7..292f6713b7 100644..100755
--- a/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
+++ b/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
diff --git a/indra/newview/app_settings/windlight/skies/Barcelona.xml b/indra/newview/app_settings/windlight/skies/Barcelona.xml
index ea9cab8fbb..ea9cab8fbb 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Barcelona.xml
+++ b/indra/newview/app_settings/windlight/skies/Barcelona.xml
diff --git a/indra/newview/app_settings/windlight/skies/Blizzard.xml b/indra/newview/app_settings/windlight/skies/Blizzard.xml
index d17d2790a8..d17d2790a8 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Blizzard.xml
+++ b/indra/newview/app_settings/windlight/skies/Blizzard.xml
diff --git a/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml b/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
index 570f059961..570f059961 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
+++ b/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
index 4925b29eea..4925b29eea 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
+++ b/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
diff --git a/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
index f4736cf4c6..f4736cf4c6 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
+++ b/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
diff --git a/indra/newview/app_settings/windlight/skies/Default.xml b/indra/newview/app_settings/windlight/skies/Default.xml
index 13a2c75046..13a2c75046 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Default.xml
+++ b/indra/newview/app_settings/windlight/skies/Default.xml
diff --git a/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml b/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
index b2a611163d..b2a611163d 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
+++ b/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
diff --git a/indra/newview/app_settings/windlight/skies/Fine%20Day.xml b/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
index e053815be1..e053815be1 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
+++ b/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
diff --git a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
index 8576ec125c..8576ec125c 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
+++ b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
diff --git a/indra/newview/app_settings/windlight/skies/Foggy.xml b/indra/newview/app_settings/windlight/skies/Foggy.xml
index cb7395d589..cb7395d589 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Foggy.xml
+++ b/indra/newview/app_settings/windlight/skies/Foggy.xml
diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
index 32be0d25e6..32be0d25e6 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
+++ b/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
diff --git a/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml b/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
index ae16b2d135..ae16b2d135 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
+++ b/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
diff --git a/indra/newview/app_settings/windlight/skies/Gelatto.xml b/indra/newview/app_settings/windlight/skies/Gelatto.xml
index 66b3d317b8..66b3d317b8 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Gelatto.xml
+++ b/indra/newview/app_settings/windlight/skies/Gelatto.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ghost.xml b/indra/newview/app_settings/windlight/skies/Ghost.xml
index 447202ed51..447202ed51 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Ghost.xml
+++ b/indra/newview/app_settings/windlight/skies/Ghost.xml
diff --git a/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml b/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
index 098844e16e..098844e16e 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
+++ b/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midday%201.xml b/indra/newview/app_settings/windlight/skies/Midday%201.xml
index 13a2c75046..13a2c75046 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midday%201.xml
+++ b/indra/newview/app_settings/windlight/skies/Midday%201.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midday%202.xml b/indra/newview/app_settings/windlight/skies/Midday%202.xml
index 04f2ba85ee..04f2ba85ee 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midday%202.xml
+++ b/indra/newview/app_settings/windlight/skies/Midday%202.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midday%203.xml b/indra/newview/app_settings/windlight/skies/Midday%203.xml
index a23dcab60b..a23dcab60b 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midday%203.xml
+++ b/indra/newview/app_settings/windlight/skies/Midday%203.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midday%204.xml b/indra/newview/app_settings/windlight/skies/Midday%204.xml
index 255e314e0f..255e314e0f 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midday%204.xml
+++ b/indra/newview/app_settings/windlight/skies/Midday%204.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midday.xml b/indra/newview/app_settings/windlight/skies/Midday.xml
index 119b3e1418..119b3e1418 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midday.xml
+++ b/indra/newview/app_settings/windlight/skies/Midday.xml
diff --git a/indra/newview/app_settings/windlight/skies/Midnight.xml b/indra/newview/app_settings/windlight/skies/Midnight.xml
index 0aba31214a..0aba31214a 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Midnight.xml
+++ b/indra/newview/app_settings/windlight/skies/Midnight.xml
diff --git a/indra/newview/app_settings/windlight/skies/Night.xml b/indra/newview/app_settings/windlight/skies/Night.xml
index c4938949ce..c4938949ce 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Night.xml
+++ b/indra/newview/app_settings/windlight/skies/Night.xml
diff --git a/indra/newview/app_settings/windlight/skies/Pirate.xml b/indra/newview/app_settings/windlight/skies/Pirate.xml
index dcb9c27ba4..dcb9c27ba4 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Pirate.xml
+++ b/indra/newview/app_settings/windlight/skies/Pirate.xml
diff --git a/indra/newview/app_settings/windlight/skies/Purple.xml b/indra/newview/app_settings/windlight/skies/Purple.xml
index 0e9ac3f36e..0e9ac3f36e 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Purple.xml
+++ b/indra/newview/app_settings/windlight/skies/Purple.xml
diff --git a/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml b/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
index 70df6b0e60..70df6b0e60 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
+++ b/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
diff --git a/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml b/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
index 4c44a1bdb2..4c44a1bdb2 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
+++ b/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
diff --git a/indra/newview/app_settings/windlight/skies/Sunrise.xml b/indra/newview/app_settings/windlight/skies/Sunrise.xml
index bbc7aeec59..bbc7aeec59 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Sunrise.xml
+++ b/indra/newview/app_settings/windlight/skies/Sunrise.xml
diff --git a/indra/newview/app_settings/windlight/skies/Sunset.xml b/indra/newview/app_settings/windlight/skies/Sunset.xml
index ebf08e1a3f..ebf08e1a3f 100644..100755
--- a/indra/newview/app_settings/windlight/skies/Sunset.xml
+++ b/indra/newview/app_settings/windlight/skies/Sunset.xml