summaryrefslogtreecommitdiff
path: root/indra/llwindow
AgeCommit message (Collapse)Author
2021-04-01Merge branch 'master' into DV528-merge-6.4.18Dave Houlton
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-528Dave Houlton
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey 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' v6.4.15 into DRTVWR-528Dave Houlton
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-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-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-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-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-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-15SL-5894 Fix llurlentry test buildingAndrey Kleshchev
2020-07-15SL-5894 #4 Organize device storage between sessionsAndrey Kleshchev
2020-07-15SL-5894 #3 WIP enumerate devices to flaoter, let floater set deviceAndrey Kleshchev
temp
2020-07-10SL-5894 Changed joystick init to select device with apropriate manufacturer ↵Andrey Kleshchev
and type
2020-06-30SL-12085 Way to debug window message processing with logcontrolAndrey Kleshchev
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-6109 Better key and table localization support and fix for key-replacingandreykproductengine
2020-06-23SL-6109 Implement keybindingsandreykproductengine
2020-06-23SL-6109 Extended Key-to-string functionalityandreykproductengine
2020-06-17SL-12085 Debug log for show() and PeekMessageAndrey Kleshchev
User's viewer freezes right after setStartupState( STATE_LOGIN_CLEANUP ) and these places are primary suspects
2020-06-15SL-12085 Debug-log window positionAndrey Kleshchev
2020-05-20Remove last occurence of DIRECTX_INCLUDE_DIR.Nicky Dasmijn
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
and the 8.1 SDK) DirectX is included in the SDK and does not need any special detection logic.
2020-05-11DRTVWR-476: Remove /showIncludes from llwindow project.Nat Goodspeed
2020-05-07DRTVWR-476: Whack-A-Mole not working, put switch on ALL llwindowNat Goodspeed
2020-05-07DRTVWR-476: Add /showIncludes to additional source files.Nat Goodspeed
Having it on just one source file was frustrating because the project build failed before it reached the one source file with the switch.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 11:05:22 +0000