Age | Commit message (Collapse) | Author | |
---|---|---|---|
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-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-02-03 | Merge with Master after Viewer release | Callum Prentice | |
2020-12-07 | Revert "SL-14270 Crash accessing deleted 'parent' via callback from child" | Andrey Kleshchev | |
There are random inventory's buildViewsTree crashes in branch with SL-14270 commit and there doesn't seem to be anything else inventory related that could have caused those. Reverting commits to see if it fixes crashes. | |||
2020-12-03 | SL-14270 A bit of cleanup #3 | Andrey Kleshchev | |
Just in case and for clarity | |||
2020-11-24 | Revert "SL-13479 Avatar menu tweaks" | Andrey Lihatskiy | |
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2. | |||
2020-11-23 | DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507 | Andrey Kleshchev | |
See changes from SL-13119 and SL-13190 | |||
2020-11-21 | SL-14368 Expanding the 'People' floater to the right does not expand the ↵ | Andrey Kleshchev | |
displayed values | |||
2020-11-12 | Mac buildfix | Andrey Lihatskiy | |
2020-11-11 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
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-11-06 | SL-14270 Crash fix | Andrey Kleshchev | |
2020-11-05 | SL-14270 A bit of cleanup #2 | Andrey Kleshchev | |
2020-11-05 | SL-14270 A bit of cleanup #1 | Andrey Kleshchev | |
2020-11-05 | SL-14270 Crash accessing deleted 'parent' via callback from child | Andrey Kleshchev | |
2020-10-14 | Mostly automatic merge with canonical viewer after release | Callum Prentice | |
2020-10-14 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
2020-10-14 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloatermodelpreview.cpp | |||
2020-10-07 | SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window. | Mnikolenko Productengine | |
2020-10-06 | SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window. | Mnikolenko Productengine | |
2020-10-02 | SL-14050 Remove all Help question marks from Viewer UI | Mnikolenko Productengine | |
2020-09-28 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llgroupmgr.cpp | |||
2020-09-24 | Complete the change from lldiskcache -> llfilesystem and then addition of ↵ | Callum Prentice | |
new lldiskcache implementation | |||
2020-09-22 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp | |||
2020-09-22 | Merge branch 'master' into DRTVWR-519 | Callum Prentice | |
2020-09-22 | Merged master (DRTVWR-503) into DRTVWR-482 | Andrey Kleshchev | |
2020-09-17 | The 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-16 | Renamed the references to LLVFile and llvfile.* source code plus cmake ↵ | Callum Prentice | |
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more | |||
2020-09-16 | First 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-09-09 | Revert "SL-12475 add Inventory Favorites tab" | Andrey Lihatskiy | |
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h | |||
2020-08-25 | SL-13498 Crash at ~LLPersistentNotificationChannel | Andrey Kleshchev | |
Callstack is clearly broken since it points to LLNotifications::instance().clear(); after 'Goodbye!', my suspicion is that something reinitialized singleton so I fixed cleanup and added some logging to see if there is a dupplicate init | |||
2020-08-18 | Merge branch 'master' into DRTVWR-482 | Andrey Lihatskiy | |
2020-08-18 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp | |||
2020-08-18 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
2020-08-11 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py | |||
2020-08-11 | Merged master into DRTVWR-482 | Andrey Kleshchev | |
2020-07-23 | SL-13642 Get rid of that ugly ignore -Wdelete-incomplete | Andrey Lihatskiy | |
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known. | |||
2020-07-22 | There was an idiom to test with LL_DARWIN if the compiler used is clang. ↵ | Nicky Dasmijn | |
This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros) | |||
2020-07-21 | Merge branch 'master' into DRTVWR-513-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp | |||
2020-07-21 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml | |||
2020-07-20 | Merge branch 'master' into DRTVWR-501-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp | |||
2020-07-15 | SL-5894 #3 WIP enumerate devices to flaoter, let floater set device | Andrey Kleshchev | |
temp | |||
2020-07-08 | SL-13479 Avatar menu tweaks | Mnikolenko Productengine | |
2020-06-24 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h | |||
2020-06-23 | Reverted SL-6109 keybinding changes | Andrey Kleshchev | |
Changes were moved to DRTVWR-514 | |||
2020-06-11 | SL-13433 Add tests for new url entry | Mnikolenko Productengine | |
2020-06-11 | SL-13433 Viewer should recognizes ipv6 links | Mnikolenko Productengine | |
2020-06-03 | SL-13364 FIXED Viewer crashes when opening Spell Check floater when ↵ | Mnikolenko Productengine | |
"SpellCheck" is FALSE | |||
2020-05-19 | Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint | Andrey Lihatskiy | |
2020-05-19 | Merge branch 'master' into DRTVWR-507-maint | Andrey Lihatskiy | |