summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
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-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.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-01-25SL-14705: Cleanup U32 S32 castPtolemy
2021-01-25SL-14705: Merge Sovereign Engineer's fix for name tags showing in front with ↵Ptolemy
AMD GPUs: Fix GL_INVALID_OPERATION when copying stencil to default window framebuffer on AMD graphics on windows
2021-01-04SL-14347 Crash at ChoosePixelFormatAndrey Kleshchev
2020-12-01SL-14347 Crash at ChoosePixelFormat SEHAndrey Kleshchev
2020-11-19SL-14347 Crash at ChoosePixelFormatAndrey Kleshchev
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
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-20SL-13733 Verify window handleAndrey Kleshchev
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-22Merge branch 'master' 6.4.9 into DRTVWR-510Dave 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-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-18SL-13733 Crash: Do not unassign event handler before handling WM_DESTROYAndrey Kleshchev
2020-09-17The 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-16First 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-08-20SL-13813 The current line is not selected after triple-clicking text in ↵Mnikolenko ProductEngine
notecard on the macOS
2020-08-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-510Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp
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-11Merged master into DRTVWR-514-keymappingsAndrey Kleshchev
2020-07-21Merge master 6.4.6 into DRTVWR-510Dave Houlton
Includes the conversion to VS2017 build tools.
2020-07-21Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
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-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-20SL-13507 Viewer should log resolution of all associated displaysMnikolenko ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 01:28:33 +0000