summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
AgeCommit message (Collapse)Author
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-01-24SL-3007 Ability to report abuse from chatAndrey Kleshchev
2022-01-14SL-16606: Add profiler category UIPtolemy
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/llui/lltextbase.h # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-08SL-16157 Crash at LLFontGL::maxDrawableCharsAndrey Kleshchev
2021-05-06Merge branch master (DRTVWR-515) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2020-10-23SL-14149 FIXED The text is displayed black after double-clicking on itMnikolenko Productengine
2020-10-14Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-09-28Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelprimmediacontrols.cpp
2020-09-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-08-14SL-13293 Fixed reshape behavior for scale changeAndrey Kleshchev
2020-05-08SL-12396 FIXED Last line can't be removed if it was selected via triple-clickingMnikolenko Productengine
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-03-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-02-12SL-12396 Triple clicking text in a textbox / textarea should only select the ↵maxim_productengine
current line
2020-02-05Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-02-05Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-01-28Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ↵Brad Payne (Vir Linden)
DRTVWR-481 Merge
2019-12-02SL-12003 FIXED Viewer Icons do not display in Profilesmaxim_productengine
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-27Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-22SL-12317 UI Changes to Group limitsmaxim_productengine
2019-11-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-09-10SL-11910 [Win] Horizontal scrollandreykproductengine
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-25SL-11028 [Legacy Profiles] Selection in account field is malfunctioningandreykproductengine
2019-04-01SL-307 Display in-viewer all warning messages logged by the mesh uploaderandreykproductengine
2019-01-03SL-10293 Firestorm PR: preferences and menu searchAndreyL ProductEngine
2017-04-06MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors.andreykproductengine
2017-03-21MAINT-7224 Chat logs move down, leaving huge empty spaceMnikolenko Productengine
2017-01-04MAINT-918 Newline was not displayed correctly in chat window.andreykproductengine
2016-09-13MAINT-6726 Fixed LLLineEditor menus staying in memory foreverandreykproductengine
2016-09-12MAINT-6720 Fixed onVisibilityChange() crash in LLTextBaseandreykproductengine
2016-05-23MAINT-2129 signuls cleanupandreykproductengine
2016-05-18MAINT-2129 "Block" button doesn't become disabledandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:12:14 +0000