Commit Graph

239 Commits (e59216443619dd2280ce0fff316a2b9e2ee7cf5e)

Author SHA1 Message Date
Andrey Lihatskiy e592164436 Merge branch 'main' into release/maint-c
# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp
2024-05-15 12:27:46 +03:00
Andrey Lihatskiy dcb85f9f9d Merge branch 'marchcat/w-whitespace' into release/maint-c 2024-05-15 12:07:29 +03:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Andrey Lihatskiy eab5beb54c Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
Andrey Lihatskiy 0acee937f5 Merge branch 'main' into marchcat/c-merge
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
2024-04-10 03:50:44 +03:00
Andrey Kleshchev a902138de1 triage#166 Select 'No Description' when clicking on a text field
Default value should be selected for replacement
2024-04-10 02:58:24 +03:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
Alexander Gavriliuk 15734c1978 viewer#961 Add a notification appearing when user tries to insert a disallowed character 2024-03-18 21:19:57 +01:00
Alexander Gavriliuk 27dd9ee482 triage#86 Use Emoji font in LineEditor by default 2024-03-05 15:37:49 +01:00
Andrey Kleshchev 78ce375dda SL-17896 Don't crash silently if files are missing or out of memory
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-03-05 00:29:35 +02:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
2024-03-04 18:01:05 +02:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Alexander Gavriliuk f6ceafee5b SL-20416 Avoid of taking focus by EmojiPicker 2024-01-24 00:07:10 +03:00
Andrey Kleshchev 51088cde7f SL-17896 Don't crash silently if files are missing or out of memory
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-01-04 21:13:06 +02:00
Alexander Gavriliuk 2fad5a770b SL-19801 Log unicode characters for debug 2023-11-30 14:08:29 +01:00
Alexander Gavriliuk c3adae2a5f SL-20391 Show Emoji Completion floater after backspacing a character 2023-10-02 15:16:26 +02:00
Alexander Gavriliuk f36f50462e SL-20387 Show Emoji Completion floater at the beginning of the shortcode 2023-10-02 14:38:11 +02:00
Maxim Nikolenko 5430efbb31
SL-20139 pressing the Tab key should paste tooltip only when hovering functions in LSL editor 2023-08-15 20:38:02 +03:00
Alexander Gavriliuk ff7ebf0892 SL-19575 Create emoji gallery access icon 2023-04-14 17:27:30 +02:00
Kitty Barnett 77afc073c5 Merge branch 'xcode-14.1' into DRTVWR-489-emoji 2023-02-08 17:18:37 +01:00
Kitty Barnett 3acb4caa0f Add emoji helper support to LLTextEditor 2022-10-23 16:28:35 +02:00
Kitty Barnett 8694f055b6 Add emoji helper support to LLTextEditor 2022-10-23 16:27:06 +02:00
Rye Mutt bbd8df15de Fix menu leaks and lazy creation in text editing and scroll lists 2022-10-19 16:28:03 -04:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
andreykproductengine d998325556 SL-10145 Right clicking on unselected link in editor near selected text shows wrong menu 2018-11-30 17:29:54 +02:00
maxim_productengine 0b37538cd2 MAINT-8431 FIXED HTTP URL in the object name is represented as a hyperlink in inventory offer 2018-04-03 11:24:02 +03:00
Mnikolenko Productengine 4261f6ee11 MAINT-6404 FIXED When pasting from Mac Word into a notecard, line break is replaced by ? 2017-03-22 17:50:04 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
andreykproductengine 0e845dc845 MAINT-6214 Unable to add a space before closing curly brace in chatbar, notecards & scripts. 2016-03-24 17:09:39 +02:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine 59a6827847 MAINT-4973 FIXED Clicking on the green part of links (as opposed to the grey) opens the wrong link in all places apart from in a conversation window or chat toast. 2015-03-13 15:45:28 +02:00
Jonathan Yap 2d7fb5c675 STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made 2014-12-28 09:34:28 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Mnikolenko ProductEngine 2801b7392a MAINT-3648 FIXED Allow opening URLs when any text is selected. 2014-12-09 11:46:03 +02:00
andreykproductengine 7982ae6b91 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
andreykproductengine 208fe31200 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
maksymsproductengine f8627d4342 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 2014-06-18 20:23:34 +03:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Cinder 79e0e7d298 Merge upstream 2014-06-07 14:14:29 -06:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
Stinson Linden babd89b770 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2014-05-19 22:19:55 +01:00
Cinder e776b600b1 Refactor more script editor properties away from LLTextEditor to LLScriptEditor 2014-05-14 14:08:24 -06:00