summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-09-30SL-13570 FIXED The name of the item is overlapped by search term in inventoryMnikolenko Productengine
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-29SL-13990 'My last location' sometimes is not appliedAndrey Kleshchev
2020-09-29SL-12743 Restored the commit lost during the mergeAndrey Lihatskiy
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-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-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-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-24SL-13888 Restore back face culling being accidently removed in SL-12781Andrey Kleshchev
Due to conflicts picked up ptolemy's fix manually
2020-09-24SL-13986 Validate uuidAndrey Kleshchev
2020-09-24SL-12435 Crash on mRowPanels.back()Andrey Kleshchev
2020-09-23SL-13986 Validate buffer size to avoid SIGBUS crash on sscanfAndrey Kleshchev
2020-09-23Fix line endingsAndrey Kleshchev
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-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
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-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-22SL-13971 [Cleanup] Viewer complains about missing VertexShaderEnableAndrey Kleshchev
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-21SL-13729 Small fix with some cached settingsAndrey Kleshchev
2020-09-18SL-13733 Crash: Do not unassign event handler before handling WM_DESTROYAndrey Kleshchev
2020-09-18SL-13729 Performance of LLUI and LLRender2D #3Andrey Kleshchev
2020-09-17SL-13729 Performance of LLUI and LLRender2D #2Andrey Kleshchev
2020-09-17SL-13729 Performance of LLUI and LLRender2DAndrey Kleshchev
2020-09-16DRTVWR-4976 Misc shader cleanup.Dave Houlton
Removed some potential div-by-0 NaNs and a mangled clamp.
2020-09-16SL-13768 clang-format class2 deferred skyF.glsl (whitespace)Dave Houlton
2020-09-16SL-13768 de-obfuscate the ALM version of skyF.glslDave Houlton