summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2022-08-26DRTVWR-568: Eliminate more blockers to C++17 language standard.Nat Goodspeed
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-24SL-17649 Icon for Material type in InventoryMnikolenko Productengine
2022-06-10SL-17523 Add reflection probe ambiance to windlight settings and integrate ↵Dave Parks
with UI and ReflectionMapManager
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
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-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
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-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Initialize PODs with 0 and not leave anyting to chance.Nicky
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-01-14SL-16606: Add profiler category ENVIRONMENTPtolemy
2021-12-20SL-16297 Init mObscureMOAP flagMnikolenko Productengine
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-17SL-16297 Support the parcel obscure_moap flag.Mnikolenko Productengine
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-10-29Fix merge conflictPtolemy
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-27SL-16127: Make another pass removing redundant LLSD op [] calls, unused ↵Ptolemy
vars, and use atmospheric already calculated
2021-10-27Merged in SL-16127 (pull request #741)Michael Pohoreski
SL-16127 Approved-by: Euclid Linden Approved-by: Dave Parks
2021-10-21SL-16127: Replace slow getLightTransmittance with faster versionPtolemy
2021-10-19SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument ↵Dave Parks
LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp
2021-08-27Merge branch 'c++17' into DRTVWR-522-maintAndrey Lihatskiy
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-06-29DRTVWR-538: Merge branch 'master' into c++17Nat Goodspeed
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-05-07SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.Nat Goodspeed
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 14:48:32 +0000