summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
AgeCommit message (Collapse)Author
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-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-10-07SL-14080 Crash in updateTextureVirtualSizeAndrey Kleshchev
LLVOVolume::updateTextures() does not check for null drawable prior to updateTextureVirtualSize
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
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-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-02SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-06-09SL-3584 Alpha masked textures occasionally changing to alpha mode noneAndrey Kleshchev
2020-05-22SL-13286 FIXED Turning off the DebugObjectLODs debug setting doesn't clear textMnikolenko Productengine
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-30SL-13141 Crashfix contributionAndrey Kleshchev
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-04-01Merged in eep-fix-falloff-edit (pull request #54)Rye Mutt
Fix light falloff being corrupted when editing value via build floater spinner Approved-by: Dave Houlton
2020-03-30Update falloff fix with changes requested in review.Rye Mutt
2020-03-30Fix light falloff being corrupted when editing value via build floater spinnerRye Mutt
2020-03-30Fix editing light color corrupting intensity and color valuesRye Mutt
2020-03-27SL-12902 Better fix for light color values in color swatch not matching ↵Runitai Linden
light color values inworld.
2020-03-27SL-12824 Imported fix for crashAndrey Kleshchev
For "Face with no texture index references indexed texture draw info"
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-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
2019-12-03SL-11582 Alpha mask objects with cutoff == 0 don't respond to clicksandreykproductengine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-25SL-12026, SL-1232 and SL-11614andreykproductengine
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-15SL-11662 - apparently a race condition between image loading and material ↵Brad Payne (Vir Linden)
property setting
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13MergeGraham Linden
2019-08-13Merge viewer-release 6.2.5Graham Linden
2019-08-06Fix shutdown crash in teardown of joint heirarchy.Graham Linden
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment) as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-07-22SL-11443Graham Linden
Make fullbright rigged objects with alpha mode none use fullbright shader instead of incorrectly using the material shader. Increase effect of variance in cloud shaders.
2019-07-12SL-11109Graham 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-01SL-11521, SL-10625Graham 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-06-28SL-11521Graham Linden
Make llvovolume submit completely transparent yet still glowy faces again.
2019-06-28SL-11514Graham Linden
Convince Geenzo code to get a little DeMorgan in it. Trophy Unlocked: make all alpha textures partcipate in picking.
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2019-06-19SL-11318Graham Linden
Make alpha pass start with no shader bound. Make diffuse mode alpha-blended fullbrights get into alpha pass properly.