diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp index bd2bb75394..43213ce125 100644 --- a/indra/llcommon/lluriparser.cpp +++ b/indra/llcommon/lluriparser.cpp @@ -29,6 +29,10 @@ #include "linden_common.h" #include "lluriparser.h" +#if !LL_WINDOWS +#include +#endif + LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0) { mState.uri = &mUri; diff --git a/indra/newview/app_settings/filters/Antique.xml b/indra/newview/app_settings/filters/Antique.xml new file mode 100644 index 0000000000..73cff17126 --- /dev/null +++ b/indra/newview/app_settings/filters/Antique.xml @@ -0,0 +1,57 @@ + + + + sepia + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 1.2 + 1.0 + 1.0 + 1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.4 + 0.1 + 0.0 + + + darken + 0.1 + 1.0 + 1.0 + 1.0 + + + stencil + vignette + blend + 0.0 + 1.0 + 0.0 + 0.0 + 1.7 + 3.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.7 + 0.3 + 0.2 + + + diff --git a/indra/newview/app_settings/filters/Badtrip.xml b/indra/newview/app_settings/filters/Badtrip.xml new file mode 100644 index 0000000000..14ee0baff3 --- /dev/null +++ b/indra/newview/app_settings/filters/Badtrip.xml @@ -0,0 +1,36 @@ + + + + grayscale + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + posterize + 10.0 + 1.0 + 1.0 + 1.0 + + + gradient + + + colorize + 0.0 + 0.0 + 1.0 + 0.0 + 0.0 + 0.15 + + + blur + + + diff --git a/indra/newview/app_settings/filters/Blownhighlights.xml b/indra/newview/app_settings/filters/Blownhighlights.xml new file mode 100644 index 0000000000..2474a1b953 --- /dev/null +++ b/indra/newview/app_settings/filters/Blownhighlights.xml @@ -0,0 +1,25 @@ + + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + stencil + uniform + add + 0.0 + 1.0 + + + gamma + 0.25 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Brighten.xml b/indra/newview/app_settings/filters/Brighten.xml new file mode 100644 index 0000000000..9b4232229f --- /dev/null +++ b/indra/newview/app_settings/filters/Brighten.xml @@ -0,0 +1,11 @@ + + + + brighten + 0.5 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Cartoon.xml b/indra/newview/app_settings/filters/Cartoon.xml new file mode 100644 index 0000000000..4be6047d02 --- /dev/null +++ b/indra/newview/app_settings/filters/Cartoon.xml @@ -0,0 +1,24 @@ + + + + gradient + + + blur + + + linearize + 0.94 + 1.0 + 1.0 + 1.0 + + + contrast + 1.2 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Darken.xml b/indra/newview/app_settings/filters/Darken.xml new file mode 100644 index 0000000000..842da5aebf --- /dev/null +++ b/indra/newview/app_settings/filters/Darken.xml @@ -0,0 +1,11 @@ + + + + darken + 0.2 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Edges.xml b/indra/newview/app_settings/filters/Edges.xml new file mode 100644 index 0000000000..42ba88b34c --- /dev/null +++ b/indra/newview/app_settings/filters/Edges.xml @@ -0,0 +1,24 @@ + + + + gradient + + + blur + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + contrast + 1.3 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Focus.xml b/indra/newview/app_settings/filters/Focus.xml new file mode 100644 index 0000000000..d8525fea62 --- /dev/null +++ b/indra/newview/app_settings/filters/Focus.xml @@ -0,0 +1,39 @@ + + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + stencil + vignette + blend + 0.0 + 0.4 + 0.0 + 0.0 + 0.5 + 2.0 + + + sharpen + + + stencil + vignette + blend + 1.0 + 0.0 + 0.0 + 0.0 + 0.5 + 2.0 + + + blur + + + diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Heatwave.xml new file mode 100644 index 0000000000..48ee5c7e62 --- /dev/null +++ b/indra/newview/app_settings/filters/Heatwave.xml @@ -0,0 +1,38 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + stencil + vignette + fade + 0.6 + 1.0 + 0.0 + 0.0 + 1.0 + 4.0 + + + colorize + 1.0 + 0.0 + 1.0 + 0.4 + 0.0 + 0.2 + + + diff --git a/indra/newview/app_settings/filters/Julesverne.xml b/indra/newview/app_settings/filters/Julesverne.xml new file mode 100644 index 0000000000..981e221da9 --- /dev/null +++ b/indra/newview/app_settings/filters/Julesverne.xml @@ -0,0 +1,20 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + grayscale + + + screen + line + 0.02 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Lightleak.xml b/indra/newview/app_settings/filters/Lightleak.xml new file mode 100644 index 0000000000..93de743ab1 --- /dev/null +++ b/indra/newview/app_settings/filters/Lightleak.xml @@ -0,0 +1,78 @@ + + + + linearize + 0.09 + 1.0 + 1.0 + 1.0 + + + brighten + 0.1 + 1.0 + 1.0 + 1.0 + + + stencil + gradient + add + 1.0 + 0.0 + -1.0 + 1.0 + 1.0 + -1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.1 + 0.1 + 0.0 + + + stencil + vignette + add + 0.0 + 1.0 + -1.0 + 1.0 + 1.5 + 5.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.8 + 0.0 + 0.0 + + + stencil + vignette + add + 0.0 + 1.0 + -1.0 + 1.0 + 1.0 + 5.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.8 + 0.8 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Linearize.xml b/indra/newview/app_settings/filters/Linearize.xml new file mode 100644 index 0000000000..23d0290e07 --- /dev/null +++ b/indra/newview/app_settings/filters/Linearize.xml @@ -0,0 +1,11 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Negative.xml b/indra/newview/app_settings/filters/Negative.xml new file mode 100644 index 0000000000..5765aaefd6 --- /dev/null +++ b/indra/newview/app_settings/filters/Negative.xml @@ -0,0 +1,11 @@ + + + + linearize + 0.9 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Overcast.xml b/indra/newview/app_settings/filters/Overcast.xml new file mode 100644 index 0000000000..dce5ab3e9e --- /dev/null +++ b/indra/newview/app_settings/filters/Overcast.xml @@ -0,0 +1,24 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.0 + 0.3 + 0.0 + + + saturate + 0.35 + + + diff --git a/indra/newview/app_settings/filters/Posterize.xml b/indra/newview/app_settings/filters/Posterize.xml new file mode 100644 index 0000000000..a96669a1d9 --- /dev/null +++ b/indra/newview/app_settings/filters/Posterize.xml @@ -0,0 +1,35 @@ + + + + blur + + + darken + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 0.9 + 1.0 + 1.0 + 1.0 + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + posterize + 3.0 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Rotatecolors180.xml b/indra/newview/app_settings/filters/Rotatecolors180.xml new file mode 100644 index 0000000000..e25029720f --- /dev/null +++ b/indra/newview/app_settings/filters/Rotatecolors180.xml @@ -0,0 +1,8 @@ + + + + rotate + 180.0 + + + diff --git a/indra/newview/app_settings/filters/Sharpen.xml b/indra/newview/app_settings/filters/Sharpen.xml new file mode 100644 index 0000000000..6d3f9ae1a2 --- /dev/null +++ b/indra/newview/app_settings/filters/Sharpen.xml @@ -0,0 +1,7 @@ + + + + sharpen + + + diff --git a/indra/newview/app_settings/filters/Softfocus.xml b/indra/newview/app_settings/filters/Softfocus.xml new file mode 100644 index 0000000000..addd056855 --- /dev/null +++ b/indra/newview/app_settings/filters/Softfocus.xml @@ -0,0 +1,7 @@ + + + + blur + + + diff --git a/indra/newview/app_settings/filters/Thematrix.xml b/indra/newview/app_settings/filters/Thematrix.xml new file mode 100644 index 0000000000..696318c6da --- /dev/null +++ b/indra/newview/app_settings/filters/Thematrix.xml @@ -0,0 +1,42 @@ + + + + grayscale + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + posterize + 50.0 + 1.0 + 1.0 + 1.0 + + + gradient + + + screen + line + 0.02 + 90.0 + + + colorize + 0.0 + 1.0 + 0.0 + 0.1 + 0.2 + 0.2 + + + blur + + + diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index fa21ba3840..6bf8de0124 100755 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -534,6 +534,13 @@ void LLLocalBitmap::updateUserSculpts(LLUUID old_id, LLUUID new_id) void LLLocalBitmap::updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type) { + // FIRE-15787: Crash fix + if (!gAgentAvatarp) + { + return; + } + // + U32 count = gAgentWearables.getWearableCount(type); for(U32 wearable_iter = 0; wearable_iter < count; wearable_iter++) { diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 791af7a980..2bf44195aa 100755 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2209,16 +2209,31 @@ void LLViewerMediaImpl::updateVolume() if (mProximityCamera > 0) { - if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMax")) + // It seems, that updateVolume() is called per frame with mMediaSource as stated in the "TODO: this is updated every frame - is this bad?" comment in this file, in LLViewerMediaImpl::update()... let's place some LLCachedControls here for performance reasons + // if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMax")) + static LLCachedControl sMediaRollOffMax(gSavedSettings, "MediaRollOffMax"); + static LLCachedControl sMediaRollOffMin(gSavedSettings, "MediaRollOffMin"); + if (mProximityCamera > sMediaRollOffMax) + // { volume = 0; } - else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin")) + // Speed up with LLCachedControls + // else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin")) + else if (mProximityCamera > sMediaRollOffMin) + // { // attenuated_volume = 1 / (roll_off_rate * (d - min))^2 // the +1 is there so that for distance 0 the volume stays the same - F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin"); - F64 attenuation = 1.0 + (gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance); + + // Speed up with LLCachedControls + // F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin"); + // F64 attenuation = 1.0 + (gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance); + static LLCachedControl sMediaRollOffRate(gSavedSettings, "MediaRollOffRate"); + F64 adjusted_distance = mProximityCamera - sMediaRollOffMin; + F64 attenuation = 1.0 + (sMediaRollOffRate * adjusted_distance); + // + attenuation = 1.0 / (attenuation * attenuation); // the attenuation multiplier should never be more than one since that would increase volume volume = volume * llmin(1.0, attenuation); diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 2fa13cb211..e8266029f7 100755 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -430,6 +430,63 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Spielzeugkamera + + Antik + + + Bad Trip + + + Verstärktes Glanzlicht + + + Weicher Fokus + + + Aufhellen + + + Cartoon + + + Abdunkeln + + + Leuchtende Kanten + + + Zentraler Focus + + + Hitzewelle + + + Jules Verne + + + Licht-Leck + + + Linearisieren + + + Negativ + + + Trüben + + + Posterisieren + + + Farbverschiebung + + + Schärfen + + + Die Matrix + Person diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f9a47ba702..889fa70868 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -232,6 +232,27 @@ Please try logging in again in a minute. Lens Flare Miniature Toy Camera + Antique + Bad Trip + Blown Highlights + Soft Focus + Brighten + Cartoon + Darken + Glowing Edges + Center Focus + Heatwave + Jules Verne + Light Leak + Linearize + Negative + Overcast + Posterize + Color Shift + Sharpen + The Matrix + + Person diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 370b04dca4..d04ce19653 100755 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -409,6 +409,60 @@ Spróbuj zalogować się ponownie za minutę. Zabawkowy aparat + + Antyk + + + Zła podróż + + + Wzmocnione podświetlenia + + + Miękkie skupienie + + + Rozjaśnienie + + + Kreskówka + + + Przyciemnienie + + + Świecące krawędzie + + + Wycentrowane skupienie + + + Upał + + + Juliusz Verne + + + Lekki wyciek + + + Zlinearyzowanie + + + Negatyw + + + Pochmurnie + + + Plakat + + + Przemieszczenie barw + + + Wyostrzenie + Osoba