Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-06-07 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-03-10 | Merge branch 'master' v6.4.17 into DRTVWR-525 | Dave Houlton | |
2021-03-09 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "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. | |||
2021-03-02 | Merge branch 'master' v 6.4.15 into DRTVWR-525 | Dave Houlton | |
2021-03-02 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' v6.4.14 into DV525-merge-6.4.14 | Dave Houlton | |
2021-02-17 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
2021-02-17 | Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519 | unknown | |
2021-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge branch 'master' into DV525-merge-6.4.13 | Dave Houlton | |
2021-02-01 | Merge remote-tracking branch 'origin/master' into DRTVWR-517 | Brad Payne (Vir Linden) | |
2021-02-01 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp | |||
2021-01-04 | SL-14529 Replace dynamic_cast to LLAvatarJoint with static casts | Andrey Kleshchev | |
Replaced couple (LLAvatarJoint*) for consistency | |||
2020-11-30 | SL-14369 Get rid of static sSkeletonXMLTree | Mnikolenko ProductEngine | |
2020-11-30 | SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup() | Mnikolenko ProductEngine | |
2020-11-13 | SL-14303 Wearable type label should contain translated intead of default string | Andrey Kleshchev | |
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel. | |||
2020-11-10 | SL-14303 Fix LLWearableType to not spam in logs | Andrey Kleshchev | |
2020-11-03 | SL-14190 moved sAvatarDictionary | Andrey Kleshchev | |
2020-10-26 | SL-14190 sAvatarDictionary was not used | Andrey Kleshchev | |
2020-10-20 | SL-14142 - impostor management cleanup | Brad Payne (Vir Linden) | |
2020-09-24 | Complete the change from lldiskcache -> llfilesystem and then addition of ↵ | Callum Prentice | |
new lldiskcache implementation | |||
2020-09-17 | The folder where the disk cache lives was originally renamed from llvfs to ↵ | Callum Prentice | |
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over | |||
2020-09-16 | Renamed the references to LLVFile and llvfile.* source code plus cmake ↵ | Callum Prentice | |
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more | |||
2020-09-16 | First part of change to remove LLVFS from the Viewer. Consists of code ↵ | Callum Prentice | |
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. | |||
2020-05-06 | DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72 | Nat Goodspeed | |
2020-03-26 | DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge. | Nat Goodspeed | |
2020-03-25 | DRTVWR-476: Eliminate LLWearableType LLSingleton circularity. | Nat Goodspeed | |
LLWearableType::initSingleton() calls LLWearableDictionary::initParamSingleton(). LLWearableDictionary's constructor constructs specific WearableEntry instances, each of which wants to translate its name string to a user-facing label using LLWearableType::mTrans. WearableEntry's constructor was calling LLWearableType::getInstance(). Under circumstances we don't fully understand (recursive mutex misbehavior?), that could hang. Instead, pass the canonical LLWearableType instance to LLWearableDictionary's constructor, and from there into WearableEntry's constructor. | |||
2020-01-28 | DRTVWR-440, merge in latest from 6.3.7 release | Dave Houlton | |
2019-11-13 | Merge in from viewer-release 6.3.5 | Dave Houlton | |
2019-11-13 | SL-12272 Ordered Shutdown log spam | andreykproductengine | |
2019-08-29 | Merge from lindenlab/viewer-release | andreykproductengine | |
2019-08-26 | Fix llavatarappearance merge to not use iterator in favor of C++11 lingo. | Graham Linden | |
2019-08-26 | Merge 6.3.1 viewer-release | Graham Linden | |
2019-08-12 | DRTVWR-493 LLWearableType to LLParamSingleton | andreykproductengine | |
2019-08-05 | SL-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-24 | SL-10625 | Graham Linden | |
2019-07-24 | SL-11610 | Graham Linden | |
Revert attempted fix for 10625. | |||
2019-07-15 | Fix OSX compiler error from missing defaulted param and changed signature of ↵ | Graham Linden | |
renderAlphaMaskTextures. | |||
2019-07-15 | SL-10761 | Graham Linden | |
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up. | |||
2019-07-12 | SL-11109 | Graham Linden | |
Make shadowAlphaMask shader ignore vertex alpha before discards iff we're a fullbright object. Keep llappearance from stuffing dangling pointers into the alpha cache (crash iff you're using nSight debugging and disable readbacks). | |||
2019-07-12 | SL-11545 | Graham Linden | |
Fix glow calcs in sky shaders (not just the not shared enough atmospherics funcs). Revert 10625 attempted fix as it breaks baggy clothes as much as skipping readbacks does. | |||
2019-07-11 | SL-10625 | Graham Linden | |
Keep texture baking from pointlessly mercy flushing GL like a kid that just discovered the toilet handle. Make glReadPixels call use GL_ALPHA8 (a texture format) instead of GL_ALPHA (an enum to indicate the alpha channel). | |||
2019-07-08 | Roll back 10625 change and continue to side-step intel readback bug. | Graham Linden | |
2019-07-08 | SL-10625 | Graham Linden | |
Appease Clang. | |||
2019-07-08 | SL-10625 another shot across the bow | Graham Linden | |
Move dynamic texture update (which does local back readback work) to just before swap which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes. | |||
2019-07-03 | SL-11545, SL-11543, SL-10625 | Graham Linden | |
Fix emissives without normal maps clobbering the alpha output in materialF. Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid). Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom. | |||
2019-07-01 | SL-11521, SL-10625 | Graham Linden | |
Try aligning data used for glReadPixels to see if we can coax the Intel driver stack into being a less souciant pile of detritus. Replace face color based test replaced with other logic in error. | |||
2019-03-05 | Merge | Anchor | |
2019-02-06 | Automated merge with ssh://bitbucket.org/lindenlab/vir-fixes | Nat Goodspeed | |