summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2021-06-07Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-06-07Increment viewer version to 6.4.20Nat Goodspeed
following promotion of DRTVWR-525
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-05-06Resolved merge conflict with SL-13587Andrey Kleshchev
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-04-29Force a clean, full rebuildEuclid Linden
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Increment viewer version to 6.4.19Nat Goodspeed
following promotion of DRTVWR-515
2021-04-16SL-15096: Merge SovereignEngineer's fix for SL-14035 regressionPtolemy
2021-04-15SL-14914 New release viewer install updated to RC unexpectedlyAndrey Kleshchev
Requested behavior: First install of a new viewer should never prompt to update to any RC. Anfortunately neither viewer nor updater can tell the difference betwen RC and optional release update, so setting updater to download only required updates.
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01SL-15061 Crash deleting non-zero reference in LLConversationItemSessionAndrey Kleshchev
2021-04-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-04-01Increment viewer version to 6.4.18Nat Goodspeed
following promotion of DRTVWR-514
2021-04-01SL-14990 Turn on shader init logging after crashAndrey Kleshchev
2021-04-01SL-15053 Use previous icon for Nearby chatMnikolenko Productengine
2021-03-31SL-14990 ig75icd64 and other intel crashesAndrey Kleshchev
Obsolete driver detection
2021-03-26SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-26SL-14975 SL-14384 viewer crashes because of large chat groupsAndrey Kleshchev
1. Due to desync participant can be NULL - added NULL checks 2. With large backlog of events, closing and then opening a goup session was causing a crash due to obsolete events - added cleanup for backlog 3. In some cases events were accumulating faster than they were processed - ensured that after certain point event processing scales up with a backlog
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Increment viewer version to 6.4.17Nat Goodspeed
following promotion of DRTVWR-532
2021-03-08Increment viewer version to 6.4.16 following revert of DRTVWR-519Brad Payne (Vir Linden)
2021-03-08Revert "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-02Merge branch 'master' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02SL-12122 - removed frametime spikes in windows build caused by unnecessary ↵Brad Payne (Vir Linden)
call to GetPerformanceInfo()
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-03-02Increment viewer version to 6.4.15Nat Goodspeed
following promotion of DRTVWR-519
2021-03-01SL-13609 Don't use any icon for Nearby chatMnikolenko Productengine
2021-02-17Merge branch 'master' v6.4.14 into DV525-merge-6.4.14Dave Houlton
2021-02-17Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519unknown
2021-02-17Increment viewer version to 6.4.14Nat Goodspeed
following promotion of DRTVWR-517
2021-02-11SL-12795 Fix log session name not updatingAndrey Kleshchev
2021-02-11SL-11215 Fixed unit testAndrey Kleshchev
2021-02-10SL-11215 Release notes url should be an urlAndrey Kleshchev
2021-02-09DRTVWR-525 housekeeping: delete unused shader fileDave Houlton
2021-02-04SL-14828 Update web_profile_url for AditiAndrey Kleshchev
2021-02-04DRTVWR-525, improve dev's quality-of-lifeDave Houlton
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01DRTVWR-525 fix build error resulting from 6.4.13 mergeDave Houlton
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:12:31 +0000