summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-29SL-15183 Crash at LLModel::matchMaterialOrderAndrey Kleshchev
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2020-12-10SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-12-09Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"Andrey Kleshchev
This reverts commit afd734b5f4ba66204f80f7726aa5fec538fcf1e4. Fix will be updated and moved to DRTVWR-515.
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-08-28SL-13566 'Use Joint Positions' Option causes collapsed Joints for some filesAndrey Kleshchev
2020-08-11SL-13698 Mac build fixAndrey Kleshchev
2020-08-11Merged master into DRTVWR-482Andrey Kleshchev
2020-08-03SL-13698 FIXED crash on model uploadMnikolenko Productengine
2020-07-21Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
2020-07-06SL-13426 Fixed crash at processDomModelAndrey Kleshchev
2020-07-02SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-04-23SL-13080 Changes for joint listings in mesh uploaderAndrey Kleshchev
2020-04-21Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/shaders/class1/objects/previewV.glsl # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp
2020-03-27SL-12902 Better fix for light color values in color swatch not matching ↵Runitai Linden
light color values inworld.
2020-03-26SL-12902 Fix for doing the technically correct but compatibility wrong thing ↵Runitai Linden
WRT light color values.
2020-03-25[DRTVWR-476] - fix compiler errors 32 bit windows buildAnchor
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).
2020-02-03Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-11-27SL-304 [Mesh Uploader] Localization support for logs, better warnings for jointsandreykproductengine
2019-09-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-09-05Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-05SL-10566 Use vector for some high-traffic, low-item count containers instead ↵Graham Linden
of list. Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-07-24SL-4150 Rename htonmemcpyandreykproductengine
2019-05-10MergeAnchor
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-05-08Merge viewer-releaseGraham Linden
2019-04-10MergeAnchor
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-01SL-307 Display in-viewer all warning messages logged by the mesh uploaderandreykproductengine
2019-03-29Tweaked naming a bit, also white space.Geenz
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29Gamma correction pass 2:Geenz
Make sure lights are in the correct color space. Bonus: cache the sRGB color in setLightColor on point and spot lights. Frees up a pow and some multiplies on the CPU every frame.
2018-12-24SL-10283 Allow changing "Repeats per meter" on face 6 of hollowed cubemaxim_productengine
2018-11-29SL-9747 [Mesh Uploader] Remove confusing model_metric from uploadandreykproductengine
2018-11-29SL-9747 [Mesh Uploader] Remove confusing model_metric from uploadandreykproductengine
2018-11-28MergeAnchor
2018-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-08-16MAINT-3699 new shaders supporting alpha blend/mask rigged content.Graham Linden
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
2018-08-08SL-928 - in mesh upload, warn if bind shape is non-identity and skin weights ↵Brad Payne (Vir Linden)
are enabled.
2018-07-30MAINT-8915Graham Linden
Fix sync of material rotation and offset values when using aligned planar faces. Make it possible to set a specific TE's normal/spec offset/rotation values. Eliminate redundant conversions in LLSD -> struct handler.
2018-07-20MAINT-8891 viewer-side fix for redundant setting of specular offset in LLSD ↵Graham Linden
to struct translation
2018-07-13MAINT-8863 - more diagnostics and possible fixBrad Payne (Vir Linden)