summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2021-06-03SL-15243 Unicode URL validationAndrey Kleshchev
2021-05-31SL-15093 Crash nanov2_free_to_block #2Andrey Kleshchev
Mostly converted some boost pointers to std ones Made ~LLNotificationChannelBase() more explicit to get a bit more data on location of another crash that likely happens when cleaning mItems
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
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.
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-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-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-12Mac buildfixAndrey Lihatskiy
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
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-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-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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:20:02 +0000