summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-19SL-13561 When ALM is enabled, disabling water rendering breaks the skyAndrey Kleshchev
2021-11-19SL-15333 Crash in glh_init_extensionsAndrey Kleshchev
2021-11-19SL-16355 - spammy message removedBrad Payne (Vir Linden)
2021-11-19SL-16330 mac build fixMnikolenko Productengine
2021-11-19SL-16329 - track frame time and jitter (as average deviation frame to frame) ↵Brad Payne (Vir Linden)
in stats window
2021-11-19SL-16094: Stylish braces!Nat Goodspeed
2021-11-19SL-16094: Only link IMM32.LIB for llurlentry tests on Windows.Nat Goodspeed
2021-11-19DRTVWR-540 Merge follow up fixAndrey Lihatskiy
2021-11-19DRTVWR-543 Post-merge build fixAndrey Lihatskiy
2021-11-19DRTVWR-540 Post-merge build fixAndrey Lihatskiy
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-19Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvoicevivox.cpp
2021-11-18SL-15794 Rapidly clicking objects or attachments triggers teleportAndrey Kleshchev
All doubleclicks should be treated as clicks in scope of editor
2021-11-18SL-14992 fmod shutdown crashAndrey Kleshchev
2021-11-18SL-16235 Restart music in case of an errorAndrey Kleshchev
Additional logging
2021-11-18SL-16235 Update fmod to 2.02.03Andrey Kleshchev
2021-11-17SL-15241 CleanupAndrey Kleshchev
2021-11-17SL-16226 Fix crash with extra large facesAndrey Kleshchev
2021-11-17SL-16330 Allow vsync update without restart on macMnikolenko ProductEngine
2021-11-16DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)Dave Houlton
2021-11-16DRTVWR-528 eradicate tab char found in 00-Common.cmake (fails Mac build)Dave Houlton
2021-11-16Merged in DV546-merge-6.5.1 (pull request #776)Euclid Linden
DRTVWR-546 merge up to 6.5.1
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merged in DV528-merge-6.5.1 (pull request #774)Euclid Linden
DRTVWR-528 merge up to 6.5.1
2021-11-16Merge branch 'master' v6.5.1 into DRTVWR-528Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-11-16SL-16362 FIXED Viewer crashes if settings.xml file is missingMnikolenko Productengine
2021-11-16DRTVWR-530 Mac buildfix: changed the license to opensourceAndrey Lihatskiy
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt # indra/newview/llpanelvolume.cpp # indra/newview/llpanelvolume.h
2021-11-16Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/llui/lltextbase.h # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16SL-16364 Removed the grid step cap for non-HUD objectsAndrey Lihatskiy
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-11-15Increment viewer version to 6.5.1Nat Goodspeed
following promotion of DRTVWR-545
2021-11-15SL-15756 Removed mHasGeneratedFacesAndrey Kleshchev
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-11-15SL-16094: In LLWindowWin32::recreateWindow(), kick window threadNat Goodspeed
before blocking on the pending future. Otherwise the window thread can remain blocked in a GetMessage() call and deadlock the app.
2021-11-15Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"Dave Houlton
This reverts commit 5188a26a8521251dda07ac0140bb129f28417e49, reversing changes made to 819088563e13f1d75e048311fbaf0df4a79b7e19.
2021-11-12(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)Dave Houlton
2021-11-12SL-14895, restore previous post-deferred alpha behaviorDave Houlton
2021-11-12Revert "SL-14895, restore previous post-deferred alpha behavior"Dave Houlton
This reverts commit ebadc409de90c75f96a005e8f45a3eee4ad243e0.
2021-11-12Merged in revert-pr-496 (pull request #772)Euclid Linden
Revert "SL-14895, point light atten should move inversely light radius (pull request #496)"
2021-11-12Revert "SL-14895, point light atten should move inversely light radius (pull ↵Euclid Linden
request #496)"
2021-11-12SL-14895, point light atten should move inversely light radiusDave Houlton
2021-11-12SL-16220: Merge branch 'origin/DRTVWR-546' into glthreadNat Goodspeed
2021-11-12DRTVWR-528 Reverting multiple commits due to moving them into D546 branchAndrey Kleshchev
This reverts commits 9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933 53c0144dd272470172591b967a84beaa4019b728 SL-11687 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056 b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391 921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561 639acb6ff7495a6840d437dd8473172ec03e200a SL-15333