summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2021-06-25SL-15297 WIP restore selection after updating the list & don't show avatars ↵Mnikolenko Productengine
in the list as disabled when complexity is not limited
2021-06-25Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2021-06-24SL-15297 WIP Implement performance floater - implement complexity barsMnikolenko Productengine
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-05-12SL-15245 Multiple guide books open, but cannot close them allAndrey Kleshchev
Opening and closing single-instance floaters rapidly and multiple times could result in cleaning instance from floaterreg twice, thus removing new isntance instead of current one
2021-05-06SL-15168 Viewer side functionality for guidebook window opening #2Andrey Kleshchev
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-28SL-15174 set Starting Guidebook location on-screenMnikolenko Productengine
2021-04-22Merge branch 'SL-14862' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llstartup.cpp
2021-04-21Revert "SL-12475 add Inventory Favorites tab"Mnikolenko Productengine
2021-04-01Merge branch 'master' into DV525-merge-6.4.18Dave Houlton
2021-04-01Merge branch 'master' (DRTVWR-514) into DRTVWR-518-uiAndrey Kleshchev
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-11SL-14862 - renamed widgets to the more descriptive controlsBrad Payne (Vir Linden)
2021-03-11SL-14862 - more generalized LLSD funcsBrad Payne (Vir Linden)
2021-03-10SL-14862 - tab loggingBrad Payne (Vir Linden)
2021-03-10Merge branch 'master' v6.4.17 into DRTVWR-525Dave Houlton
2021-03-10SL-14862 - use nested LLSD for widget info, condensed to the two leaf-most ↵Brad Payne (Vir Linden)
elements of the path. Simplified floater logging.
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-518-uiAndrey 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' v 6.4.15 into DRTVWR-525Dave Houlton
2021-03-02Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-01SL-14862 - more types of UI usage logsBrad Payne (Vir Linden)
2021-02-18SL-14862 - catching more commands in LLUIUsageBrad Payne (Vir Linden)
2021-02-16SL-14725 Validate trackball elevationAndrey Kleshchev
2021-02-16SL-14725 Add elevation and azimuth to local lightingAndrey Kleshchev
2021-02-15SL-14725 Rotation sliders for sun and moon panelsAndrey Kleshchev
2021-02-11SL-14862 - line endings fix, avoid period in key namesBrad Payne (Vir Linden)
2021-02-11SL-14862 - LLViewerStats logs which UI features get usedBrad Payne (Vir Linden)
2021-02-03SL-14796 After teleporting, add notation into Nearby ChatAndrey Kleshchev
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DV525-merge-6.4.13Dave Houlton
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-518-uiAndrey 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.
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-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp