summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2023-06-01SL-18330: Merge branch 'main' of secondlife/viewer into xcode-14.3Nat Goodspeed
2023-05-19SL-18837: Clean up more set-but-unused variables for Xcode 14.3Nat Goodspeed
2023-05-19SL-18837: Merge branch 'xcode-14.1' of secondlife/viewer into xcode-14.3Nat Goodspeed
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-03-31Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/llfloateravatarrendersettings.cpp
2023-03-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-17SL-18735 Fix scroll not following item for long enoughAndrey Kleshchev
2023-02-13Fix up a couple of tiny merge conflicts after a merge with mainCallum Prentice
2023-02-09Merge branch 'main' into DRTVWR-577-maint-SAndrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-01-24SL-17425 Crash when having more than one dependent floater #2Andrey Kleshchev
2023-01-16SL-18735 Using "Find original" in main inventory tab breaks inventory viewAndrey Kleshchev
Fixes folders being invidible (missing arrange) Fixes sroll to target not working reliably
2023-01-16Merge branch 'xcode-14.1' into DRTVWR-577-maint-SAndrey Kleshchev
D577 should have picked part of the changes from contribute branch, picking up the rest for the sake of branch specific crash fixes
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2023-01-10SL-18911 My Land Holdings floater crashes viewer on the Xcode/+Monterey ↵akleshchev
branches (#47) Revert part of "DRTVWR-575: Address review comments on Xcode 14.1 type tweaks." Crash was reproduced when assigning areastr to llsd, but likely present in other cases of assigning ui strings to llsd (instead of going for lluistring's result directly copy constructor was engaged and either copy or original crashed due to invalid pointers, copy shouldn't have been created).
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-12-02SL-18734 certain links are not displayed appropriatelyMaxim Nikolenko
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-11-22SL-18689 Crash at LLTabContainer::selectNextTab()Andrey Kleshchev
FPE_NOOP at "idx = (idx + 1 ) % (S32)mTabList.size();"
2022-11-01Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-11-01Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into ↵Andrey Lihatskiy
DRTVWR-570-maint-Q
2022-10-30Fix line editors deselecting when pressing capslockRye Mutt
2022-10-30Fix checks for empty LLSD maps to use size and not emptyMap which is for ↵Rye Mutt
creating an empty LLSDMap type.
2022-10-24SL-18388 Searchable debug settings UIMnikolenko Productengine
2022-10-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp
2022-10-20Merge branch 'master' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-10-19Fix leak of LLFolderViewModel sorter and filter with unique_ptrRye Mutt
2022-10-19Fix leak of item pairs during LLFlatListView destructionRye Mutt
2022-10-19Fix menu leaks and lazy creation in text editing and scroll listsRye Mutt
2022-10-19Reduce folderview menu bloat via lazy creation on right clickRye Mutt
2022-10-19Fix leak of context menu branchesRye Mutt
Introduce menu bloat logging code
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-548-maint-NAndrey Kleshchev
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-15SL-18153 Fixed bring to front multiple dialog handlingAndrey Kleshchev
2022-09-14SL-18153 Fix invisible blocking popupAndrey Kleshchev
Don't add popup to the list twice
2022-09-14SL-18153 Fix invisible blocking popupAndrey Kleshchev
Don't add popup to the list twice
2022-08-30Merge branch 'master' into DRTVWR-568Callum Linden
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 06:22:37 +0000