summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-09-28Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-28Increment viewer version to 6.4.10Nat Goodspeed
following promotion of DRTVWR-497
2020-09-28SL-13335 Use regular font style for 'Get started' buttonMnikolenko Productengine
2020-09-26SL-14007 Group icon in "About land" displays wrong iconAndrey Kleshchev
2020-09-25SL-13132 Fixed missing 'owner' labelAndrey Kleshchev
2020-09-25SL-13034 Last string in logs should say 'Goodbye'Andrey Kleshchev
These logs were not logging for very long due to supressed logging system, no point showing them now
2020-09-25SL-13034 removeMarkerFiles() happens in destructorAndrey Kleshchev
Depends onto SL-13979 for proper logging
2020-09-25post-merge cleanupAndrey Lihatskiy
2020-09-25SL-13873 update copyright date to 2020Mnikolenko Productengine
2020-09-25SL-12962 rename remained stringsMnikolenko Productengine
2020-09-25SL-13979 Crash of logging system at LLError::Settings::getInstance()Andrey Kleshchev
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-24SL-13888 Restore back face culling being accidently removed in SL-12781Andrey Kleshchev
Due to conflicts picked up ptolemy's fix manually
2020-09-24Rename lldiskcache.* to llfilesystem.* - i think this is the right name ↵Callum Prentice
since it's responsible for performing file system operations and (will eventually) delegrate to a separate disk cache component to save/load data and keep track of metadata etc.
2020-09-24SL-14001 New Inventory search visibility options should persist from login ↵Mnikolenko Productengine
to login
2020-09-23Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-09-23Fix line endingsAndrey Kleshchev
2020-09-23SL-13335 Init default button widthMnikolenko Productengine
2020-09-23SL-13821 Fixed checkbox not disablingAndrey Kleshchev
2020-09-23SL-13335 Friendlier L$ Buy flow when no payment method on fileMnikolenko Productengine
2020-09-23SL-13814 Updated label textMnikolenko Productengine
2020-09-23SL-13814 mac build fixMnikolenko Productengine
2020-09-23SL-13814 Clarify dialog for insufficient L$ balanceMnikolenko Productengine
2020-09-23SL-11867 Show “Unable to buy” message via notificationmaxim_productengine
2020-09-23SL-13852 Show menu below the buttonMnikolenko Productengine
2020-09-23SL-13852 Add visibility options to inventory search resultsMnikolenko Productengine
2020-09-23SL-13824 Remove notification when both joining a group and leaving a groupMnikolenko Productengine
2020-09-23SL-13824 Remove notification when joining a groupMnikolenko Productengine
2020-09-23 SL-13823 FIXED "Settings" are not shown in Inventory filter messageMnikolenko Productengine
2020-09-22Add SQLite third package to this viewer and pull in the most recent build (3.33)Callum Prentice
2020-09-22Merged in DV497-merge-6.4.9 (pull request #312)Dave Houlton
Merge 6.4.9 into DRTVWR-497
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged in euclid-13522 (pull request #309)Dave Houlton
SL-13522 remove injected character lights to improve alpha lighting in edit mode Approved-by: Michael Pohoreski
2020-09-22follow-up build fixAndrey Lihatskiy
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-482Andrey Kleshchev
2020-09-22Increment viewer version to 6.4.9Nat Goodspeed
following promotion of DRTVWR-503
2020-09-21SL-13522 remove injected character lights to improve alpha blendDave Houlton
Character lights injected during render pass while in character edit mode (i.e. mSpecialRenderMode == 3) were causing discrepencies between deferred (ALM) and forward alpha blend lighting.
2020-09-22SL-13978 Logout crash at LLParamSingleton<LLUI>Andrey Kleshchev
Notifications were cleaned up by this point and were pulling in LLUI
2020-09-21SL-13697 Items I am wearing continue to go to lost and foundAndrey Kleshchev
Contribution from Ansariel Hiller
2020-09-18SL-13733 Crash: Do not unassign event handler before handling WM_DESTROYAndrey Kleshchev
2020-09-18SL-13705 - added --deleted option to collect info on no-longer-needed text ↵Brad Payne (Vir Linden)
in translated files. Processing needs to be automated as the list is unfeasibly long.
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
2020-09-17Some small changes to replace 'vfs' with 'filesystem' outside of my dev envCallum Prentice
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-17Merged in euclid-misc (pull request #305)Dave Houlton
DRTVWR-4976 Misc shader cleanup. Approved-by: Michael Pohoreski