livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
74,794 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

325 Commits (bba4103edf5d2df0f33d702f89c1f6b972cedc00)

Author SHA1 Message Date
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
 2024-05-01 12:30:57 +02: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
Ansariel 7355b798d2 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/lltexturefetch.cpp
 2024-04-12 19:33:20 +02: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
Ansariel 7804859af2 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/panel_landmark_info.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2024-03-27 14:07:32 +01:00
Ansariel cbf6aca2e8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
 2024-03-27 10:35:43 +01: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
Ansariel 1f75fbd3b5 Merge branch 'main' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerwindow.cpp
 2024-03-26 22:43:42 +01: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
Ansariel 159ef68fa7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llfloateremojipicker.cpp
 2024-03-17 16:41:38 +01:00
Beq 425da225a6 Add support for B&W emoji rendering. 
Requires updated 3p-viewer-fonts package.
 2024-03-09 02:48:06 +00:00
Ansariel 80c3fe0101 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-03-05 21:27:49 +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
Ansariel ac898495ae Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
 2024-03-04 22:38:34 +01: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
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2024-03-01 20:49:42 +01:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2024-01-26 00:32:06 +01:00
Alexander Gavriliuk f6ceafee5b SL-20416 Avoid of taking focus by EmojiPicker 2024-01-24 00:07:10 +03:00
Ansariel ab2675497b Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llpanelprofile.cpp
 2024-01-05 14:31:37 +01: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
Ansariel f072b3f952 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-11-30 19:16:29 +01:00
Alexander Gavriliuk 2fad5a770b SL-19801 Log unicode characters for debug 2023-11-30 14:08:29 +01:00
Ansariel 478cbd595b Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llpanelemojicomplete.cpp
#	indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
 2023-10-04 16:17:22 +02: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
Ansariel 652e89917e Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2023-08-16 13:30:37 +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
Ansariel 181ac13338 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llerrorthread.cpp
 2023-07-18 11:09:03 +02:00
Zi Ree 7a77145cd3 FIRE-19959: Fix unindent after } when a previous line had a word wrap 2023-07-17 17:21:13 +02:00
Ansariel 719a2d31dc Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llui/llscrolllistctrl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/textures/textures.xml
 2023-04-22 12:02:23 +02:00
Alexander Gavriliuk ff7ebf0892 SL-19575 Create emoji gallery access icon 2023-04-14 17:27:30 +02:00
Ansariel 3079cda486 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llvoicevivox.h
 2023-02-10 00:50:19 +01:00
Kitty Barnett 77afc073c5 Merge branch 'xcode-14.1' into DRTVWR-489-emoji 2023-02-08 17:18:37 +01:00
Ansariel 9e3079f859 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontregistry.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/widgets/chat_editor.xml
 2023-01-23 16:49:24 +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
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
 2022-10-20 10:51:25 +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
Zi Ree 9fb09ce231 FIRE-32175 - Linux/SDL2: Alt-Tab pushes a tab character into scripts and notecards 2022-10-04 20:47:39 +02:00
Ansariel 8ed636b3a5 Allow Shift-Tab to tab-remove in text editors 2021-12-12 00:18:01 +01:00
Beq a3f4de55b5 FIRE-31081 - Bugsplat crash - null this ptr in setItemVisible. 2021-07-19 12:10:45 +01:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel b4ab48c849 Merge viewer-neko 2018-12-13 00:34:43 +01: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
Ansariel 34f6702339 FIRE-19933: Open context menu on context menu key press (Windows) 2018-07-13 00:31:07 +02:00
Ansariel 9203b70ca3 Merge viewer-neko 2018-04-07 13:40:21 +02:00