summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
AgeCommit message (Collapse)Author
2020-11-06Reapplied SL-11215: Add release notes URLs to update-related notifications.Andrey Kleshchev
In scope of SL-13740 work, this reverts commit 1935d25c78bf46f0fdc8758b6f215f53d17fd94a.
2020-11-05SL-14275: Add two new Water Reflection modes to Graphics AdvancedPtolemy
2020-10-23SL-14050 remove references to viewer-helpMnikolenko Productengine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-10-07Add in some cache stats for the about boxCallum Prentice
2020-10-06Remove SQLite from project and we are now not going to use it for the cacheCallum Prentice
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-09-28Merge with tip of ReleaseCallum Prentice
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-28Merged master(DRTVWR-497) into DRTVWR-482Andrey Kleshchev
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-28SL-13335 Use regular font style for 'Get started' buttonMnikolenko Productengine
2020-09-25SL-12962 rename remained stringsMnikolenko 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-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 Updated label text"Mnikolenko Productengine
This reverts commit 1557cd8fe2733c32c7788daf752fe23c7190947f.
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 Clarify dialog for insufficient L$ balanceMnikolenko Productengine
2020-09-23SL-11867 Show “Unable to buy” message via notificationmaxim_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-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
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-514-keymappingsAndrey Kleshchev
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-22SL-13971 [Cleanup] Viewer complains about missing VertexShaderEnableAndrey Kleshchev
2020-09-17Remove references to VFS in the non-English language XML files (already ↵Callum Prentice
removed from English (en) versions)
2020-09-16First 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-14SL-13937 FIXED 'Loading...' is constantly displayed when entering the URL on ↵Mnikolenko Productengine
the 'Media URL' floater
2020-09-09Revert "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-09-09SL-12475 add Inventory Favorites tabmaxim_productengine
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 09:29:48 +0000