livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

Nicky 2015-03-26 21:48:31 +01:00
parent df61b683e9 a84cad1d7d
commit 92b6994353
25 changed files with 670 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/lluriparser.cpp
View File

@ -29,6 +29,10 @@
#include "linden_common.h"
#include "lluriparser.h"
#if !LL_WINDOWS
#include <stdint.h>
#endif
LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0)
{
mState.uri = &mUri;

57
indra/newview/app_settings/filters/Antique.xml Normal file
View File

@ -0,0 +1,57 @@
<llsd>
<array>
<array>
<string>sepia</string>
</array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>contrast</string>
<real>1.2</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.4</real>
<real>0.1</real>
<real>0.0</real>
</array>
<array>
<string>darken</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>blend</string>
<real>0.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.0</real>
<real>1.7</real>
<real>3.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.7</real>
<real>0.3</real>
<real>0.2</real>
</array>
</array>
</llsd>

36
indra/newview/app_settings/filters/Badtrip.xml Normal file
View File

@ -0,0 +1,36 @@
<llsd>
<array>
<array>
<string>grayscale</string>
</array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>posterize</string>
<real>10.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>gradient</string>
</array>
<array>
<string>colorize</string>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.0</real>
<real>0.15</real>
</array>
<array>
<string>blur</string>
</array>
</array>
</llsd>

25
indra/newview/app_settings/filters/Blownhighlights.xml Normal file
View File

@ -0,0 +1,25 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
<string>uniform</string>
<string>add</string>
<real>0.0</real>
<real>1.0</real>
</array>
<array>
<string>gamma</string>
<real>0.25</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

11
indra/newview/app_settings/filters/Brighten.xml Normal file
View File

@ -0,0 +1,11 @@
<llsd>
<array>
<array>
<string>brighten</string>
<real>0.5</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

24
indra/newview/app_settings/filters/Cartoon.xml Normal file
View File

@ -0,0 +1,24 @@
<llsd>
<array>
<array>
<string>gradient</string>
</array>
<array>
<string>blur</string>
</array>
<array>
<string>linearize</string>
<real>0.94</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>contrast</string>
<real>1.2</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

11
indra/newview/app_settings/filters/Darken.xml Normal file
View File

@ -0,0 +1,11 @@
<llsd>
<array>
<array>
<string>darken</string>
<real>0.2</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

24
indra/newview/app_settings/filters/Edges.xml Normal file
View File

@ -0,0 +1,24 @@
<llsd>
<array>
<array>
<string>gradient</string>
</array>
<array>
<string>blur</string>
</array>
<array>
<string>linearize</string>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>contrast</string>
<real>1.3</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

39
indra/newview/app_settings/filters/Focus.xml Normal file
View File

@ -0,0 +1,39 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>blend</string>
<real>0.0</real>
<real>0.4</real>
<real>0.0</real>
<real>0.0</real>
<real>0.5</real>
<real>2.0</real>
</array>
<array>
<string>sharpen</string>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>blend</string>
<real>1.0</real>
<real>0.0</real>
<real>0.0</real>
<real>0.0</real>
<real>0.5</real>
<real>2.0</real>
</array>
<array>
<string>blur</string>
</array>
</array>
</llsd>

38
indra/newview/app_settings/filters/Heatwave.xml Normal file
View File

@ -0,0 +1,38 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>contrast</string>
<real>0.8</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>fade</string>
<real>0.6</real>
<real>1.0</real>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>4.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>0.0</real>
<real>1.0</real>
<real>0.4</real>
<real>0.0</real>
<real>0.2</real>
</array>
</array>
</llsd>

20
indra/newview/app_settings/filters/Julesverne.xml Normal file
View File

@ -0,0 +1,20 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>grayscale</string>
</array>
<array>
<string>screen</string>
<string>line</string>
<real>0.02</real>
<real>0.0</real>
</array>
</array>
</llsd>

78
indra/newview/app_settings/filters/Lightleak.xml Normal file
View File

@ -0,0 +1,78 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.09</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>brighten</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>stencil</string>
<string>gradient</string>
<string>add</string>
<real>1.0</real>
<real>0.0</real>
<real>-1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>-1.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.1</real>
<real>0.1</real>
<real>0.0</real>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>add</string>
<real>0.0</real>
<real>1.0</real>
<real>-1.0</real>
<real>1.0</real>
<real>1.5</real>
<real>5.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.8</real>
<real>0.0</real>
<real>0.0</real>
</array>
<array>
<string>stencil</string>
<string>vignette</string>
<string>add</string>
<real>0.0</real>
<real>1.0</real>
<real>-1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>5.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.8</real>
<real>0.8</real>
<real>0.0</real>
</array>
</array>
</llsd>

11
indra/newview/app_settings/filters/Linearize.xml Normal file
View File

@ -0,0 +1,11 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

11
indra/newview/app_settings/filters/Negative.xml Normal file
View File

@ -0,0 +1,11 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.9</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

24
indra/newview/app_settings/filters/Overcast.xml Normal file
View File

@ -0,0 +1,24 @@
<llsd>
<array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>colorize</string>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.3</real>
<real>0.0</real>
</array>
<array>
<string>saturate</string>
<real>0.35</real>
</array>
</array>
</llsd>

35
indra/newview/app_settings/filters/Posterize.xml Normal file
View File

@ -0,0 +1,35 @@
<llsd>
<array>
<array>
<string>blur</string>
</array>
<array>
<string>darken</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>contrast</string>
<real>0.9</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>linearize</string>
<real>0.01</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>posterize</string>
<real>3.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</array>
</llsd>

8
indra/newview/app_settings/filters/Rotatecolors180.xml Normal file
View File

@ -0,0 +1,8 @@
<llsd>
<array>
<array>
<string>rotate</string>
<real>180.0</real>
</array>
</array>
</llsd>

7
indra/newview/app_settings/filters/Sharpen.xml Normal file
View File

@ -0,0 +1,7 @@
<llsd>
<array>
<array>
<string>sharpen</string>
</array>
</array>
</llsd>

7
indra/newview/app_settings/filters/Softfocus.xml Normal file
View File

@ -0,0 +1,7 @@
<llsd>
<array>
<array>
<string>blur</string>
</array>
</array>
</llsd>

42
indra/newview/app_settings/filters/Thematrix.xml Normal file
View File

@ -0,0 +1,42 @@
<llsd>
<array>
<array>
<string>grayscale</string>
</array>
<array>
<string>linearize</string>
<real>0.1</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>posterize</string>
<real>50.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
<array>
<string>gradient</string>
</array>
<array>
<string>screen</string>
<string>line</string>
<real>0.02</real>
<real>90.0</real>
</array>
<array>
<string>colorize</string>
<real>0.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.1</real>
<real>0.2</real>
<real>0.2</real>
</array>
<array>
<string>blur</string>
</array>
</array>
</llsd>

7
indra/newview/lllocalbitmaps.cpp
View File

@ -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)
{
// <FS:Ansariel> FIRE-15787: Crash fix
if (!gAgentAvatarp)
{
return;
}
// </FS:Ansariel>
U32 count = gAgentWearables.getWearableCount(type);
for(U32 wearable_iter = 0; wearable_iter < count; wearable_iter++)
{

23
indra/newview/llviewermedia.cpp
View File

@ -2209,16 +2209,31 @@ void LLViewerMediaImpl::updateVolume()
if (mProximityCamera > 0)
{
if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMax"))
// <FS:PP> 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<F32> sMediaRollOffMax(gSavedSettings, "MediaRollOffMax");
static LLCachedControl<F32> sMediaRollOffMin(gSavedSettings, "MediaRollOffMin");
if (mProximityCamera > sMediaRollOffMax)
// </FS:PP>
{
volume = 0;
}
else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin"))
// <FS:PP> Speed up with LLCachedControls
// else if (mProximityCamera > gSavedSettings.getF32("MediaRollOffMin"))
else if (mProximityCamera > sMediaRollOffMin)
// </FS:PP>
{
// 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);
// <FS:PP> Speed up with LLCachedControls
// F64 adjusted_distance = mProximityCamera - gSavedSettings.getF32("MediaRollOffMin");
// F64 attenuation = 1.0 + (gSavedSettings.getF32("MediaRollOffRate") * adjusted_distance);
static LLCachedControl<F32> sMediaRollOffRate(gSavedSettings, "MediaRollOffRate");
F64 adjusted_distance = mProximityCamera - sMediaRollOffMin;
F64 attenuation = 1.0 + (sMediaRollOffRate * adjusted_distance);
// </FS:PP>
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);

57
indra/newview/skins/default/xui/de/strings.xml
View File

@ -430,6 +430,63 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="Toycamera">
Spielzeugkamera
</string>
<string name="Antique">
Antik
</string>
<string name="Badtrip">
Bad Trip
</string>
<string name="Blownhighlights">
Verstärktes Glanzlicht
</string>
<string name="Softfocus">
Weicher Fokus
</string>
<string name="Brighten">
Aufhellen
</string>
<string name="Cartoon">
Cartoon
</string>
<string name="Darken">
Abdunkeln
</string>
<string name="Edges">
Leuchtende Kanten
</string>
<string name="Focus">
Zentraler Focus
</string>
<string name="Heatwave">
Hitzewelle
</string>
<string name="Julesverne">
Jules Verne
</string>
<string name="Lightleak">
Licht-Leck
</string>
<string name="Linearize">
Linearisieren
</string>
<string name="Negative">
Negativ
</string>
<string name="Overcast">
Trüben
</string>
<string name="Posterize">
Posterisieren
</string>
<string name="Rotatecolors180">
Farbverschiebung
</string>
<string name="Sharpen">
Schärfen
</string>
<string name="Thematrix">
Die Matrix
</string>
<string name="TooltipPerson">
Person
</string>

21
indra/newview/skins/default/xui/en/strings.xml
View File

@ -232,6 +232,27 @@ Please try logging in again in a minute.</string>
<string name="LensFlare">Lens Flare</string>
<string name="Miniature">Miniature</string>
<string name="Toycamera">Toy Camera</string>
<string name="Antique">Antique</string>
<string name="Badtrip">Bad Trip</string>
<string name="Blownhighlights">Blown Highlights</string>
<string name="Softfocus">Soft Focus</string>
<string name="Brighten">Brighten</string>
<string name="Cartoon">Cartoon</string>
<string name="Darken">Darken</string>
<string name="Edges">Glowing Edges</string>
<string name="Focus">Center Focus</string>
<string name="Heatwave">Heatwave</string>
<string name="Julesverne">Jules Verne</string>
<string name="Lightleak">Light Leak</string>
<string name="Linearize">Linearize</string>
<string name="Negative">Negative</string>
<string name="Overcast">Overcast</string>
<string name="Posterize">Posterize</string>
<string name="Rotatecolors180">Color Shift</string>
<string name="Sharpen">Sharpen</string>
<string name="Thematrix">The Matrix</string>
<!-- Tooltip -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->

54
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -409,6 +409,60 @@ Spróbuj zalogować się ponownie za minutę.
<string name="Toycamera">
Zabawkowy aparat
</string>
<string name="Antique">
Antyk
</string>
<string name="Badtrip">
Zła podróż
</string>
<string name="Blownhighlights">
Wzmocnione podświetlenia
</string>
<string name="Softfocus">
Miękkie skupienie
</string>
<string name="Brighten">
Rozjaśnienie
</string>
<string name="Cartoon">
Kreskówka
</string>
<string name="Darken">
Przyciemnienie
</string>
<string name="Edges">
Świecące krawędzie
</string>
<string name="Focus">
Wycentrowane skupienie
</string>
<string name="Heatwave">
Upał
</string>
<string name="Julesverne">
Juliusz Verne
</string>
<string name="Lightleak">
Lekki wyciek
</string>
<string name="Linearize">
Zlinearyzowanie
</string>
<string name="Negative">
Negatyw
</string>
<string name="Overcast">
Pochmurnie
</string>
<string name="Posterize">
Plakat
</string>
<string name="Rotatecolors180">
Przemieszczenie barw
</string>
<string name="Sharpen">
Wyostrzenie
</string>
<string name="TooltipPerson">
Osoba
</string>