summaryrefslogtreecommitdiff
path: root/indra/llprimitive/CMakeLists.txt
AgeCommit message (Collapse)Author
2024-08-02Remove dead pcre library dependency (#2177)Rye Mutt
2024-05-20#1392 GLTF Upload (#1394)Dave Parks
* #1392 WIP -- Functional texture upload, stubbed out .bin upload. * #1392 GLTF Upload WIP -- Emulates successful upload Successfully uploads texture Emulates successful .gltf and .bin upload by injecting into local asset cache. Emulates rez from inventory by setting sculpt ID of selected object Currently fails in tinygltf parsing due to missing .bin * Add missing notification * Build fix * #1392 Add boost::json .gltf reading support. * #1392 boost::json GLTF writing prototype * Create gltf/README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * #1392 Add ability to render directly from LL::GLTF::Material * Fix for mac build * Mac build fix * #1392 AssetType and Inventory Type plumbing * #1392 More sane error handling and scheduling of uploads. * #1392 Actually attempt to upload glbin * Mac build fix, upload nudge * Mac build fix * Fix glTF asset uploads to server * Mac build fix (inline not static) * More consistent inline * Add glm, mac nudge. * #1392 For consistency with spec, start using glm over glh:: and LLFoo * Another attempt at placating Mac builds * Another Mac nudge * Mac build take 23 * #1392 Prune LLMatrix4a from GLTF namespace. * #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw) * #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering * #1392 Working download! * #1394 Add support for GLTFEnabled SimulatorFeature * #1392 Review feedback --------- Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2023-10-09SL-20225: LLGLTFMaterial code syncCosmic Linden
2023-03-30CMake and tests fixups after merge with main for DRTVWR-559Brad Linden
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-09SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF ↵Cosmic Linden
compliance and removal of unsupported features
2022-10-14SL-18105 Add to/from json capability to LLGLTFMaterialDave Parks
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-06-23SL-17653 Last commit was accidentally partialDave Parks
2022-06-08SL-17214 add 3p-tinygltf dependency to autobuild.xmlDave Houlton
2022-06-08SL-17214 additional glTF validation, remove dead code from DAE loaderDave Houlton
2022-06-08SL-17214 initial loader class skeletonDave Houlton
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-27SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and ↵Brad Kittenbrink
related messages
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
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-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-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.
2020-03-25SL-793: Use Boost.Fiber instead of the "dcoroutine" library.Nat Goodspeed
Longtime fans will remember that the "dcoroutine" library is a Google Summer of Code project by Giovanni P. Deretta. He originally called it "Boost.Coroutine," and we originally added it to our 3p-boost autobuild package as such. But when the official Boost.Coroutine library came along (with a very different API), and we still needed the API of the GSoC project, we renamed the unofficial one "dcoroutine" to allow coexistence. The "dcoroutine" library had an internal low-level API more or less analogous to Boost.Context. We later introduced an implementation of that internal API based on Boost.Context, a step towards eliminating the GSoC code in favor of official, supported Boost code. However, recent versions of Boost.Context no longer support the API on which we built the shim for "dcoroutine." We started down the path of reimplementing that shim using the current Boost.Context API -- then realized that it's time to bite the bullet and replace the "dcoroutine" API with the Boost.Fiber API, which we've been itching to do for literally years now. Naturally, most of the heavy lifting is in llcoros.{h,cpp} and lleventcoro.{h,cpp} -- which is good: the LLCoros layer abstracts away most of the differences between "dcoroutine" and Boost.Fiber. The one feature Boost.Fiber does not provide is the ability to forcibly terminate some other fiber. Accordingly, disable LLCoros::kill() and LLCoprocedureManager::shutdown(). The only known shutdown() call was in LLCoprocedurePool's destructor. We also took the opportunity to remove postAndSuspend2() and its associated machinery: FutureListener2, LLErrorEvent, errorException(), errorLog(), LLCoroEventPumps. All that dual-LLEventPump stuff was introduced at a time when the Responder pattern was king, and we assumed we'd want to listen on one LLEventPump with the success handler and on another with the error handler. We have never actually used that in practice. Remove associated tests, of course. There is one other semantic difference that necessitates patching a number of tests: with "dcoroutine," fulfilling a future IMMEDIATELY resumes the waiting coroutine. With Boost.Fiber, fulfilling a future merely marks the fiber as ready to resume next time the scheduler gets around to it. To observe the test side effects, we've inserted a number of llcoro::suspend() calls -- also in the main loop. For a long time we retained a single unit test exercising the raw "dcoroutine" API. Remove that. Eliminate llcoro_get_id.{h,cpp}, which provided llcoro::get_id(), which was a hack to emulate fiber-local variables. Since Boost.Fiber has an actual API for that, remove the hack. In fact, use (new alias) LLCoros::local_ptr for LLSingleton's dependency tracking in place of llcoro::get_id(). In CMake land, replace BOOST_COROUTINE_LIBRARY with BOOST_FIBER_LIBRARY. We don't actually use the Boost.Coroutine for anything (though there exist plausible use cases).
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-29DRTVWR-409: merge DRTVWR-368Rider Linden
2015-08-19Be sure the correct include is included.Rider Linden
2015-08-17Adding llcorehttp to linksRider Linden
2014-05-29Mergeup to 3.7.9 viewer-releaseGraham Linden
2014-04-22Modify importer to (optionally) improve debug output, perform name-based LOD ↵Graham Linden
association, and handle models with many materials.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-20merge with releaseRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-06SH-4080 WIP interesting: random crash on MacRichard Linden
cleaning up more unused files
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-11-29Encapsulate material definitions in LLMaterial and refactor ↵Kitty Barnett
LLFloaterDebugMaterials to use the new class
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-09Initial pass at getting a list of viewer objects with non-null material IDs.William Todd Stinson
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2010-09-30Put some errant tests under if (LL_TESTS) conditional.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-18VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake filesAimee Linden
2009-12-07Merge of viewer 2 changesPalmer
2009-11-28Migrated LLUUIDs and some float constants out of headers into .cpp filesJames Cook
Moved some functions with llinfos into .cpp files Linker optimizations, all
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers