summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
AgeCommit message (Collapse)Author
2021-09-20SL-16006 and SL-16009 Rigged mesh rendering optimization passDave Parks
2021-09-03SL-15709: Add Tracy support to viewerPtolemy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-26SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha ↵Dave Houlton
masks. Revert "SL-12069 Issues with bakes-on-mesh and alpha modes" This reverts commit 5691d302ef876a7e6fb6861441f14e5e7f0c7735.
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
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)
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
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-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp
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-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
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-09-21SL-13729 Small fix with some cached settingsAndrey Kleshchev
2020-09-09SL-3278 Small adjustementAndrey Kleshchev
2020-09-08SL-3278 Compensate for randomly-switching texturesAndrey Kleshchev
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 17:18:04 +0000