summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2023-08-29SL-20211 EmojiPicker - The search field should be the same as other floatersAlexander Gavriliuk
2023-08-24Merge remote-tracking branch 'origin/main' into DRTVWR-489Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-07-28SL-20088 EmojiPicker - replace the image on the activation button with an emojiAlexander Gavriliuk
2023-07-18DRTVWR-489: trivial merge conflict fixCallum Prentice
2023-07-18SL-19891 Make sure focusable elements clear focus on destructionAndrey Kleshchev
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-07-13SL-20001 EmojiPicker - make the preview to be a panel instead of a buttonAlexander Gavriliuk
2023-07-07SL-19951 Organize emoji categories in groupsAlexander Gavriliuk
2023-07-05SL-19575 Rework emoji picker layout similar to SlackAlexander Gavriliuk
2023-06-01SL-19762 fix for cropped label textMnikolenko Productengine
2023-05-29SL-19787 Crash at LLUIColor::operatorAndrey Kleshchev
2023-05-26Merge branch 'xcode-14.3' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # indra/llcommon/llsdserialize.h
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-18SL-19649 Adjust other classes for new deleteAllChildren mechanicsAndrey Kleshchev
2023-05-18SL-19649 reduce logging out time for larger inventoriesMaxim Nikolenko
2023-05-18SL-19575 Create emoji gallery (use ::value_type in LLEmojiDictionary typedefs)Alexander Gavriliuk
2023-05-17Some small tweaks after merge with Viewer releaseCallum Prentice
2023-05-17SL-19575 Create emoji gallery (fix bug with drawing emojis in chat history)Alexander Gavriliuk
2023-05-17Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp
2023-05-02MErge with main after Viewer releaseCallum Prentice
2023-05-02Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
2023-05-02Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-04-25SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixupAlexander Gavriliuk
2023-04-25Load correct localized version of emoji dictionary and guard against access ↵Ansariel
violation exception
2023-04-20SL-19575 LLFloaterEmojiPicker - Add filter by categoryAlexander Gavriliuk
2023-04-14SL-19575 Create emoji gallery access iconAlexander Gavriliuk
2023-04-03DRTVWR-489: Fix things up after a messy merge with main because of a ↵Callum Prentice
gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
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-580-maint-TAndrey Lihatskiy
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-24SL-17045 LSL editor cursor position desynchronizationAlexander Gavriliuk
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-03-19SL-19417 Improve colors.xml behaviorAlexander Gavriliuk
2023-03-19SL-19099 The long name of the item is out of bounds on the Editing ↵Alexander Gavriliuk
Tools/Content tab
2023-03-03SL-19336 Unload avatar and group icons from memory when not visible to ↵Rye Mutt
reduce memory pressure on extremely large friends lists
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-08Merge branch 'xcode-14.1' into DRTVWR-489-emojiKitty Barnett
2023-02-08Merge branch 'main' into xcode-14.1Kitty Barnett
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-26DRTVWR-489-emoji: A couple of tabs slipped into this file and our new ↵Callum Prentice
no-tabs coding policy caught it and failed the build
2023-01-26DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer ↵Callum Prentice
working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer
2023-01-26Merge branch 'xcode-14.1' into DRTVWR-489-emojiCallum Prentice
2023-01-24SL-17425 Crash when having more than one dependent floater #2Andrey Kleshchev
2023-01-20Fix merge conflicts after auto mergeCallum Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 22:04:49 +0000