summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2025-08-21Merge tag 'Second_Life_Release#787b63f4-2025.06' into 2025.06Erik Kundiman
2025-08-21Merge tag 'Second_Life_Release#143de1dd-2025.06' into 2025.06Erik Kundiman
2025-08-20#3922 Crash on removeStringNoUndoAndrey Kleshchev
2025-08-15#4561 Crash at initializeURLHistoryAndrey Kleshchev
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-08-08Merge branch '2025.05' into 2025.06Erik Kundiman
2025-08-06Merge branch develop into 2025.06Andrey Kleshchev
# Conflicts: # indra/newview/llvoavatar.cpp
2025-07-29#4385 show agent name next to @ mention url in chat logsMaxim Nikolenko
2025-07-17#4047 fix 'Show on Map' command for parcel URI linksMaxim Nikolenko
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-06-27#4184 clearAndDeparentModels crashAndrey Kleshchev
To resolve dual ownership switched children to LLPointer
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-27Add font buffer resetting in LLLineEditor.clear() (#4159)TJ
2025-05-23Merge tag 'Second_Life_Release#fe55c781-2025.04' into 2025.04Erik Kundiman
2025-05-22#4132 fix name mentions sometimes not being highlightedMaxim Nikolenko
2025-05-22#4110 Crash on LLScrollListCtrl::deleteSelectedItemsAndrey Kleshchev
2025-05-22Merge tag 'Second_Life_Release#a31b7ae2-Second_Life_Release#a31b7ae-2025.04' ↵Erik Kundiman
into 2025.04
2025-05-22Merge branch 'main' into 2025.04Erik Kundiman
2025-05-12Have unencapsulated Expat headers in any conditionErik Kundiman
The only condition where Expat headers would be encapsulated is when using LL's Autobuild-based prebuilt libraries, and we're never using any of LL's prebuilt binary for Expat on desktop, since Expat is practically available on any supported desktop platform. The system Expat headers are never encapsulated in any of those platforms. This is the beginning of not relying on the LL_USESYSTEMLIBS macro any more (eventually not relying on the custom USESYSTEMLIBS CMake setting either). Keeping the build system still flexible to have the option to use LL's prebuilt libraries *fully* (we still use some of them in cases where the platform may not have the related system library or for convenience, so the term USESYSTEMLIBS may not always be consistent), is getting harder to maintain. The way it's done is using #if 1, in order to minimise difference from upstream.
2025-05-09#3758 do not reopen avatar picker floaterMaxim Nikolenko
2025-05-09Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04Erik Kundiman
2025-05-07#4011 Add conversation list highlight for chat mentionMaxim Nikolenko
2025-05-05#4009 Add color settings for chat mentions to PreferencesMaxim Nikolenko
2025-04-30Merge tag 'Second_Life_Release#d9e55c44-Second_Life_Release#d9e55c4-2025.04' ↵Erik Kundiman
into 2025.04
2025-04-25#3758 clean up: move EUnderlineLinkMnikolenko Productengine
2025-04-25post merge fixMnikolenko Productengine
2025-04-25Merge branch 'release/2025.04' into 2025.04-chat-mentionMnikolenko Productengine
2025-04-25#3758 disable editing of mention segmentMnikolenko Productengine
2025-04-23#3758 show mention name in bubble chatMnikolenko Productengine
2025-04-23#3952 insert @ name at the cursor positionMnikolenko Productengine
2025-04-23#3962 allow Tab work the same way as picking name with EnterMnikolenko Productengine
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-18Merge develop into release/2025.04Andrey Kleshchev
2025-04-18Restore missing 'override'Andrey Lihatskiy
2025-04-18#3758 initial chat mention supportMnikolenko Productengine
2025-04-18#3758 add support for highlighted segmentsMnikolenko Productengine
2025-04-18Restore missing 'override'Andrey Lihatskiy
2025-04-18Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-18Merge branch 'release/2025.05' into marchcat/05-developAndrey Lihatskiy
2025-04-17Merge pull request #3933 from Ansariel/develop-llui-improvementsJonathan "Geenz" Goodman
Clean up LLUI and fix/add suggestions from VS
2025-04-18Clean up LLUI and fix/add suggestions from VS (#2746)Ansariel Hiller
# Conflicts: # indra/llui/lltextbase.h # indra/llui/lltexteditor.h # indra/llwindow/llwindowsdl.cpp
2025-04-18Restore currently entered text in chat entry textbox after going through ↵Ansariel Hiller
history with Ctrl-PgUp/PgDown (#2680)
2025-04-17#3897 Fix favorite's stars being hidden in some cases #2Andrey Kleshchev
2025-04-17#3922 out_of_range crash in preeditorAndrey Kleshchev
2025-04-16#3910 Sometimes can't favorite a folderAndrey Kleshchev
due to version mismatch. Should use LLInventoryModel::changeItemParent
2025-04-15Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-13 22:22:05 +0000