summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2022-05-26Merge remote-tracking branch 'remotes/origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
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-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-06SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
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-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-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-25SL-17223 fix unit tests with new method stub implementationBrad Kittenbrink
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-20SL-17246 Fix getSharedPrt typoMnikolenko Productengine
2022-04-20SL-17242 Use proper cap for setting pathfinding attributesMnikolenko Productengine
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-18Increment viewer version to 6.5.5Nat Goodspeed
following promotion of DRTVWR-540
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-18- More include changes for xmlrpc.hNicky
- New versions of curl have the same value for CURLE_SSL_PEER_CERTIFICATE and CURLE_SSL_CACERT
2022-04-18Another instance where LLFilePicker::getSaveFile had the wrong number of ↵Nicky
arguments.
2022-04-18ASN1_STRING_data is depreacted.Nicky
2022-04-18Correctio for preproc #elseNicky
2022-04-18Add argument missing from implementationNicky
2022-04-18Remove obsolete targets and dependencies.Nicky
2022-04-18jsoncpp includepath should not include json/. jsoncpp includes a header ↵Nicky
"features.h" which has the same name as a glibc header, allowing this header to be found without any prefix will lead to head conflicts when there is a '#include "features.h"' As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-17Remove function create_target and instead directly use add_libraryNicky
2022-04-17Switch over to standard target_link_libraries (cmake requirements are high ↵Nicky
enough now).
2022-04-16Streamline fmodstudio/openal targets:Nicky
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp - Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used. - To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-16Remove undefined variablesNicky
2022-04-16Pull in LL_GLOD=1 via target, not by hand crafted magic.Nicky
2022-04-16Use variable LLSTARTUP_COMPILE_FLAGS only when it is defined.Nicky
2022-04-16Remove some more obsolete includes (UnixInstall) and include_directories()Nicky
2022-04-16create target ll::uilibraries to have one common target that defines what eachNicky
operation system needs as dependencies on OS gui libraries.
2022-04-16Go back to more modern way to compile the physics stubNicky
2022-04-16Now there is a oslibrary target get rid of some more obsolete vars:Nicky
LEGACY_STDIO_LIBS (was only used for Windows) PTHREAD_LIBRARY (only Linux) LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16Create a new target ll::oslibrary to link against libs specific to the OS ↵Nicky
compiled on. This gets rid of the a few OS specific set and uses variables (which some even seemed mostly duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-14Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-14SL-17218: Per NickyD review feedback, test LLFace::mNormals too.Nat Goodspeed
2022-04-14SL-17218: Update faulty test for null LLFace::mTangentsNat Goodspeed
2022-04-14SL-17035 Crash at gl_debug_callbackAndrey Kleshchev
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14Parameter to onClickConnect must be bool, not int.Nicky
(cherry picked from commit 5c6228e56a688a98606ce28077d6089adc833873)
2022-04-13Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13Remove obsolete and unmaintained USE_SYSTEMLIBSNicky
2022-04-09Cleanup windows step that copies input artifacts. Make sure the rightNicky
paths are used, throw out files not even existing anymore.
2022-04-09Bump cmake version needed up to 3.16 so target_precompile_headers can beNicky
used.
2022-04-07SL-17092 Fix a gesture upload crashAndrey Kleshchev