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

Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer

master
Ansariel 2022-11-22 16:23:13 +01:00
parent 02804db43b 9ea7526f60
commit abbfb9b7d0
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -672,9 +672,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ae90d19cdcddf539f6d0b41cab12f918</string>
<string>7b4aceaed511d44c4d1354b2162b59c7</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72773/702861/bugsplat-1.0.7.552580-darwin64-552580.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107398/936936/bugsplat-1.0.7.576560-darwin64-576560.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -684,9 +684,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f5936eceb6a33ff0f1cc31996a40f29c</string>
<string>53918c7c74b943cdc0bb90caf9657a84</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72774/702905/bugsplat-3.6.0.8.552580-windows-552580.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107400/936949/bugsplat-4.0.3.0.576560-windows-576560.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -696,16 +696,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9cd940754e53e0670030b3da5ba8f373</string>
<string>19d6a55db101f02e7eb531daf3e8cfd1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72775/702906/bugsplat-3.6.0.8.552580-windows64-552580.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107401/936948/bugsplat-.576560-windows64-576560.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>3.6.0.8.552580</string>
<string>4.0.3.0.576560</string>
</map>
<key>colladadom</key>
<map>

1
doc/contributions.txt
View File

@ -285,6 +285,7 @@ Beq Janus
SL-15709
SL-16021
SL-16027
SL-18637
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani

2
indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
View File

@ -230,7 +230,7 @@ void main()
#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_MASK)
// Comparing floats cast from 8-bit values, produces acne right at the 8-bit transition points
float bias = 0.001953125; // 1/512, or half an 8-bit quantization
float bias = 0.001953125; // 1/512, or half an 8-bit quantization (SL-18637)
if (diffcol.a < minimum_alpha-bias)
{
discard;

8
indra/newview/lldrawpoolbump.cpp
View File

@ -41,6 +41,7 @@
#include "lldrawable.h"
#include "llface.h"
#include "llsky.h"
#include "llstartup.h"
#include "lltextureentry.h"
#include "llviewercamera.h"
#include "llviewertexturelist.h"
@ -90,6 +91,7 @@ void LLStandardBumpmap::shutdown()
// static
void LLStandardBumpmap::restoreGL()
{
addstandard();
}
// static
@ -102,6 +104,12 @@ void LLStandardBumpmap::addstandard()
return ;
}
if (LLStartUp::getStartupState() < STATE_SEED_CAP_GRANTED)
{
// Not ready, need caps for images
return;
}
// can't assert; we destroyGL and restoreGL a lot during *first* startup, which populates this list already, THEN we explicitly init the list as part of *normal* startup. Sigh. So clear the list every time before we (re-)add the standard bumpmaps.
//llassert( LLStandardBumpmap::sStandardBumpmapCount == 0 );
clear();

1
indra/newview/llstartup.cpp
View File

@ -3855,6 +3855,7 @@ void reset_login()
gAgentWearables.cleanup();
gAgentCamera.cleanup();
gAgent.cleanup();
gSky.cleanup(); // mVOSkyp is an inworld object.
LLWorld::getInstance()->resetClass();
if ( gViewerWindow )