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

Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q

master
Andrey Lihatskiy 2022-11-09 00:41:58 +02:00
parent 67ce0e77d7 94cb1ba16c
commit 2904062948
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -1657,6 +1657,7 @@ Zi Ree
STORM-1790
STORM-1842
SL-18348
SL-18593
Zipherius Turas
VWR-76
VWR-77

2
indra/llcommon/threadsafeschedule.h
View File

@ -248,7 +248,7 @@ namespace LL
TimePoint until = TimePoint::clock::now() + std::chrono::hours(24);
pop_result popped = tryPopUntil_(lock, until, tt);
if (popped == POPPED)
return std::move(tt);
return tt;
// DONE: throw, just as super::pop() does
if (popped == DONE)

4
indra/newview/llsettingsvo.cpp
View File

@ -694,8 +694,8 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
LLVector4 sunDiffuse = LLVector4(psky->getSunlightColor().mV);
LLVector4 moonDiffuse = LLVector4(psky->getMoonlightColor().mV);
LLVector4 sunDiffuse = LLVector4(LLVector3(psky->getSunlightColor().mV));
LLVector4 moonDiffuse = LLVector4(LLVector3(psky->getMoonlightColor().mV));
shader->uniform4fv(LLShaderMgr::SUNLIGHT_COLOR, sunDiffuse);
shader->uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, moonDiffuse);

4
indra/newview/llvosky.cpp
View File

@ -100,8 +100,8 @@ LLSkyTex::LLSkyTex() :
void LLSkyTex::init(bool isShiny)
{
mIsShiny = isShiny;
mSkyData = new LLColor4[SKYTEX_RESOLUTION * SKYTEX_RESOLUTION];
mSkyDirs = new LLVector3[SKYTEX_RESOLUTION * SKYTEX_RESOLUTION];
mSkyData = new LLColor4[(U32)(SKYTEX_RESOLUTION * SKYTEX_RESOLUTION)];
mSkyDirs = new LLVector3[(U32)(SKYTEX_RESOLUTION * SKYTEX_RESOLUTION)];
for (S32 i = 0; i < 2; ++i)
{