Age | Commit message (Collapse) | Author | |
---|---|---|---|
2021-12-15 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-11-16 | Merge branch 'master' into DRTVWR-519 | Andrey Lihatskiy | |
# Conflicts: # README.md | |||
2021-11-16 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-10-29 | SL-14664 Fix missed pixmap init | Andrey Kleshchev | |
2021-09-03 | Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp | |||
2021-06-07 | Merge with tip of Master after Viewer release | Callum Prentice | |
2021-06-07 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-06-07 | Merge branch 'master' into DRTVWR-521-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-05-26 | SL-15196 Attach correct log file to Bugsplat report | Mnikolenko Productengine | |
2021-04-30 | Merge branch 'master' into DRTVWR-530-maint | Andrey Lihatskiy | |
2021-04-30 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt | |||
2021-04-29 | Clean up a merge conflict | Callum Prentice | |
2021-04-29 | Merge master into DV525-merge-6.4.19 | Dave Houlton | |
2021-04-27 | SL-14664 Added zoomout and sizeall | Andrey Kleshchev | |
Remade code to use getCursorFromString | |||
2021-04-22 | SL-14977 Extended AltGr to cover oem symbols | Andrey Kleshchev | |
Typing '}' via 'altgr+=' into a script makes the viewer to derender particles | |||
2021-04-01 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2021-04-01 | Merge branch 'master' into DV525-merge-6.4.18 | Dave Houlton | |
2021-04-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/lltoolpie.cpp | |||
2021-04-01 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-10 | Merge branch 'master' v6.4.17 into DRTVWR-525 | Dave Houlton | |
2021-03-09 | This 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-09 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-03-09 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-08 | Revert "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-02 | Merge branch 'master' v 6.4.15 into DRTVWR-525 | Dave Houlton | |
2021-03-02 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
2021-03-02 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Lihatskiy | |
2021-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2021-02-01 | Merge branch 'master' into DV525-merge-6.4.13 | Dave Houlton | |
2021-02-01 | Merge branch 'master' into DRTVWR-514-keymappings | Andrey Kleshchev | |
# Conflicts: # indra/llui/llscrolllistctrl.cpp | |||
2021-02-01 | Merge 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-01 | Merge branch 'master' into DRTVWR-522-maint | Andrey Lihatskiy | |
2021-01-25 | SL-14705: Cleanup U32 S32 cast | Ptolemy | |
2021-01-25 | SL-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-21 | SL-14720 FIXED Undo function is incorrect on German Mac keyboard | Mnikolenko ProductEngine | |
2021-01-04 | SL-14347 Crash at ChoosePixelFormat | Andrey Kleshchev | |
2020-12-01 | SL-14347 Crash at ChoosePixelFormat SEH | Andrey Kleshchev | |
2020-11-19 | SL-14347 Crash at ChoosePixelFormat | Andrey Kleshchev | |
2020-11-13 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp | |||
2020-11-11 | Merge branch 'master' 6.4.12 into DRTVWR-510 | Dave Houlton | |
2020-11-11 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-11-11 | Merged master (DRTVWR-507) into DRTVWR-514-keymappings | Andrey Kleshchev | |
2020-11-11 | Merge branch 'master' into DRTVWR-513-maint | Andrey 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-20 | SL-13733 Verify window handle | Andrey Kleshchev | |
2020-10-08 | DRTVWR-510 remove all LL_SOLARIS conditionals | Dave Houlton | |
2020-09-28 | Merge branch 'master' into DRTVWR-515-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp | |||
2020-09-28 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llgroupmgr.cpp |