summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-27DRTVWR-543 post-merge cleanupAndrey Lihatskiy
2022-05-27post-merge build fixAndrey Lihatskiy
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-25Increment viewer version to 6.6.1Nat Goodspeed
following promotion of DRTVWR-546
2022-05-19SL-17451 Fix for erroneous attempt to apply vertex color alpha to texture ↵Dave Parks
before alpha masking (we don't actually support this and the vertex color alpha is sometimes zero when you think it ought not be).
2022-05-18SL-17449 Fix for Alexa's hairDave Parks
2022-05-18SL-17417 Fix for incorrect reflection orientation on fullbright prims.Dave Parks
2022-05-17Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-546
2022-05-17SL-17421 Fix for fullbright alpha mask shader ignoring vertex alphaDave Parks
2022-05-17SL-17415 Movement of scripted attached objects is no longer interpolated.Andrey Kleshchev
2022-05-16SL-17417 Fix for incorrect reflection orientation on some moving child prims.Dave Parks
2022-05-11SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-10SL-17376 Do not fail build if vcruntime140_1 is missingAndrey Kleshchev
If there is no vcruntime140_1 in the build system, it is likely that file is not required for the viewer to run.
2022-05-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-08- Slightly better documentation string for --configuration, as this really ↵Nicky
is used for the configs build subdirectory. - Always pass the correct configuration for --buildtype - Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-07Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-07Remove unused LL_ARCH/LL_ARCH_DIRNicky
2022-05-07ADDRESS_SIZE auto detection was broken with python3, fix this.Nicky
- Simplify detection by using regex - OSX is always 64 bit
2022-05-07Cache ENV{LL_BUILD} to LL_BUILD_ENV:Nicky
- ENV{LL_BUILD} takes precedence - if ENV{LL_BUILD} is not set but LL_BUILD-ENV is, set ENV{LL_BUILD} to the cached version - error if none of the two is set Caching the variable and reusing it lets cmake run when not called by autobuild itself. This happens when xcode or visual studio detect it needs to be re rerun and call it for the "cmake" target. Not having LL_BUILD then makes those targets fail.
2022-05-07Remove logging.Nicky
2022-05-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-06SL-17375 Crash at LLViewerOctreeEntry::getSpatialExtents()Andrey Kleshchev
access violation, 'this' was null
2022-05-06SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-05SL-17244 Fix 'empty leaf' crashesAndrey Kleshchev
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-543-maint_cmakeAndrey Lihatskiy
2022-05-04Increment viewer version to 6.5.6Nat Goodspeed
following promotion of DRTVWR-550
2022-05-02SL-17321 Fix for some particle systems with custom blend functions not ↵Dave Parks
rendering.
2022-05-01Another place that needed generator expressions.Nicky
2022-05-01Fix for viewer_manifest.py using a hardcoded path to grab runtime files.Nicky
2022-05-01${AUTOBUILD_INSTALL_DIR}/lib/release is always needed as a fallbackNicky
linking directory.
2022-05-01Simplify cmake files by uaing generator expressions and be moreNicky
configuration specific, rather than staging files to Release and RelWithdebInfo all the time
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-29SL-17124 make sure window thread wakes up to proces 'quit' messageAndrey Kleshchev
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- Do not try initializing shaders if requirements are not met or if window does not exist - Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close() - mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-28SL-16721 Crash at LLVOAvatar::idleUpdateMiscAndrey Kleshchev
2022-04-28SL-17301 FIXED Friends are not showing in friendslistMnikolenko Productengine
2022-04-26SL-17276 Potential fix for crash on shutdown on mac.Dave Parks
2022-04-26SL-17086 Fix for bad lighting in upload preview render.Dave Parks
2022-04-25SL-17239 Override face bounding box with avatar bounding box for rigged ↵Dave Parks
meshes when calculating virtual size.
2022-04-25SL-17223 fix unit tests with new method stub implementationBrad Kittenbrink
2022-04-25SL-17236 For real this time, maintain legacy draw order of alpha rigged ↵Dave Parks
meshes, batching be damned.
2022-04-25Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get ↵Brad Kittenbrink
lost in case of crash
2022-04-23Setting openal option in cache had gone poof.Nicky
2022-04-21SL-17040 Crash due to LLWord not existingAndrey Kleshchev
LLWord should persist till the end due to wide usage.
2022-04-21SL-17159 Crash initializing LLInstanceTrackerPrivateAndrey Kleshchev
2022-04-20SL-17246 Fix getSharedPrt typoMnikolenko Productengine
2022-04-20SL-17242 Use proper cap for setting pathfinding attributesMnikolenko Productengine