summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2021-02-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-01-05SL-14074 Resolved potential cause of conversation crashesAndrey Kleshchev
Models (listeners) belong to folder-views, deleting all of them means that not only proper cleanup procedure won't be followed, and view might try clean dead pointer.
2021-01-04SL-14494 FIXED llRequestURL() generated URLs are no longer recognized by the ↵Mnikolenko Productengine
viewer as Second Life hosted URLs
2020-12-07Revert "SL-14270 Crash accessing deleted 'parent' via callback from child"Andrey Kleshchev
There are random inventory's buildViewsTree crashes in branch with SL-14270 commit and there doesn't seem to be anything else inventory related that could have caused those. Reverting commits to see if it fixes crashes.
2020-12-03SL-6109 Crash fix for left right selection shift when nothing or whole ↵Andrey Kleshchev
string is selected
2020-12-03SL-14270 A bit of cleanup #3Andrey Kleshchev
Just in case and for clarity
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
2020-11-24SL-13479 Avatar menu tweaksMnikolenko Productengine
2020-11-23DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507Andrey Kleshchev
See changes from SL-13119 and SL-13190
2020-11-21SL-14368 Expanding the 'People' floater to the right does not expand the ↵Andrey Kleshchev
displayed values
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-13Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.cpp # indra/newview/llenvironment.cpp
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-12Mac buildfixAndrey Lihatskiy
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:38:51 +0000