diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
| commit | 290406294891cba3e3f1496ff952d4b485d0fc49 (patch) | |
| tree | e02c02f130b4e00054028b400e7974252cde8495 | |
| parent | 67ce0e77d786b21c40e12b242e4646cfe6915e26 (diff) | |
| parent | 94cb1ba16c5b301779e437f73af9e06558f15760 (diff) | |
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/threadsafeschedule.h | 2 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6bd8cd916b..6d8cef881b 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1657,6 +1657,7 @@ Zi Ree STORM-1790 STORM-1842 SL-18348 + SL-18593 Zipherius Turas VWR-76 VWR-77 diff --git a/indra/llcommon/threadsafeschedule.h b/indra/llcommon/threadsafeschedule.h index 3e0da94c02..0c3a541196 100644 --- a/indra/llcommon/threadsafeschedule.h +++ b/indra/llcommon/threadsafeschedule.h @@ -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) diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 7c762170a7..707b602fc6 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -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); diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 1aa00bc894..909588367b 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -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) { |