summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey 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-06SL-14270 Crash fixAndrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #2Andrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #1Andrey Kleshchev
2020-11-05SL-14270 Crash accessing deleted 'parent' via callback from childAndrey Kleshchev
2020-10-23SL-14149 FIXED The text is displayed black after double-clicking on itMnikolenko Productengine
2020-10-14Mostly automatic merge with canonical viewer after releaseCallum Prentice
2020-10-14DRTVWR-510 merge master 6.4.11Dave Houlton
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-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2020-10-07SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-06SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-02SL-14050 Remove all Help question marks from Viewer UIMnikolenko Productengine
2020-09-30SL-13570 FIXED The name of the item is overlapped by search term in inventoryMnikolenko Productengine
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-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-23Revert "SL-13852 Add visibility options to inventory search results"Mnikolenko Productengine
This reverts commit 18566c502398e0e449717a06b1ffae3966e55522.
2020-09-23SL-13335 Friendlier L$ Buy flow when no payment method on fileMnikolenko Productengine
2020-09-23SL-13852 Add visibility options to inventory search resultsMnikolenko Productengine
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-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-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-16Renamed 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-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-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
2020-08-31SL-13852 Add visibility options to inventory search resultsMnikolenko Productengine
2020-08-25SL-13498 Crash at ~LLPersistentNotificationChannelAndrey 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-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-14SL-13293 Fixed reshape behavior for scale changeAndrey Kleshchev
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 22:03:33 +0000