summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-28SL-13995 User Friendly Script Name In External Editor TabAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
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-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-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey 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-24Merged in SL-13888 (pull request #317)Michael Pohoreski
SL-13888 Restore back face culling being accidently removed in SL-12781 Approved-by: Dave Houlton Approved-by: Andrey Kleshchev
2020-09-24SL-13888 Coding Standard: be consistent; use TAB indentPtolemy
2020-09-24SL-13888 Restore back face culling being accidently removed in SL-12781Ptolemy
2020-09-24SL-13986 Validate uuidAndrey Kleshchev
2020-09-24SL-12435 Crash on mRowPanels.back()Andrey Kleshchev
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-23SL-13986 Validate buffer size to avoid SIGBUS crash on sscanfAndrey Kleshchev
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-23Revert " SL-13823 FIXED "Settings" are not shown in Inventory filter message"Mnikolenko Productengine
This reverts commit 0048a4cf18f958591c5e4f9ec829e4ecdc642926.
2020-09-23Revert "SL-13824 Remove notification when joining a group"Mnikolenko Productengine
This reverts commit fc74a2df6364889149b5ebd0638839582fda358f.
2020-09-23Revert "SL-13824 Remove notification when both joining a group and leaving a ↵Mnikolenko Productengine
group" This reverts commit 34786ac22129aac372eeb1e73b6baac6bfad644e.
2020-09-23Revert "SL-13852 Add visibility options to inventory search results"Mnikolenko Productengine
This reverts commit 18566c502398e0e449717a06b1ffae3966e55522.
2020-09-23Revert "SL-13852 Show menu below the button"Mnikolenko Productengine
This reverts commit bac27a9d74bc8eb55699aedcf957ba7532ef02c5.
2020-09-23Revert "SL-11867 Show “Unable to buy” message via notification"Mnikolenko Productengine
This reverts commit 7e2e2503c5fb57736844bdad0f309d2d49ee86b2.
2020-09-23Revert "SL-13814 Clarify dialog for insufficient L$ balance"Mnikolenko Productengine
This reverts commit f150600ffb17232bfa88a6225aab437460fc9520.
2020-09-23Revert "SL-13814 mac build fix"Mnikolenko Productengine
This reverts commit 85d90ce6bda00f1cb6fc8f0a75e739f1273843b3.
2020-09-23Revert "SL-13814 Updated label text"Mnikolenko Productengine
This reverts commit 1557cd8fe2733c32c7788daf752fe23c7190947f.
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