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
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
b1a271c3aa
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/ICU4C.cmake
# indra/llui/lltextbase.h
# indra/llui/llview.h
# indra/newview/CMakeLists.txt
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2024-03-17 17:53:34 +01:00
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
b40ff113c5
Allow fading emojis characters in fading text.
...
In the recent emojis implementation, the text color alpha is ignored
(emojis are always rendered with an opaque white color), causing them
to fail and fade properly with the rest of the text they are printed
with.
This trivial patch fixes this issue.
2024-03-15 21:45:55 +02:00
425da225a6
Add support for B&W emoji rendering.
...
Requires updated 3p-viewer-fonts package.
2024-03-09 02:48:06 +00:00
80c3fe0101
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
2024-03-05 21:27:49 +01:00
27dd9ee482
triage#86 Use Emoji font in LineEditor by default
2024-03-05 15:37:49 +01:00
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
ae91ae43a5
SL-20795 Part of previously typed emojis disappear in the 'Save settings as a preset...' option of the 'Preferences' floater
2024-01-17 04:34:21 +01:00
e7f1466a7b
Merge branch main into DRTVWR-489
2023-10-08 14:01:05 +02:00
49bbb565b6
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:56:32 +02:00
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
be655fef7f
:x
2023-10-03 14:23:38 +02:00
c5d7f3c4c1
DRTVWR-489: trivial merge conflict fix
2023-07-18 10:51:51 -07:00
3eaa83f4d1
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/floater_emoji_picker.xml
2023-07-18 11:53:23 +02:00
181ac13338
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llerrorthread.cpp
2023-07-18 11:09:03 +02:00
6ee5d6053f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/skins/default/xui/de/notifications.xml
2023-07-18 10:22:07 +02:00
acf82867b6
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
2023-07-17 23:34:59 +03:00
1fe007abef
SL-20001 EmojiPicker - make the preview to be a panel instead of a button
2023-07-13 22:13:31 +02:00
7bcb251661
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llmessage/llcoproceduremanager.cpp
# indra/llui/lllayoutstack.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-04-21 12:08:40 +02:00
81d69cf84d
SL-19379 WIP add worn suffix, use bold font style for worn items and italic for links
2023-03-31 13:40:59 +03:00
5baeb998eb
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
2023-03-30 13:08:32 +02:00
d1b414e48b
SL-17045 LSL editor cursor position desynchronization
2023-03-24 22:17:36 +01:00
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
7ebaa2d2e5
Merge branch contribution/emoji into DRTVWR-489-emoji
2022-11-09 23:25:02 +01:00
cf2afdc541
Add emoji as its own font to promote character reuse
2022-10-23 16:26:36 +02:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
2238f89db7
SL-16141 Load fonts and generate glyphs on startup
2021-10-11 18:05:27 +03:00
5326c9cdb0
FIRE-30833: Add Cascadia Code font both as option for the UI as for the script editor
2021-03-20 13:45:54 +01:00
5a6ddb2ea6
Fallback fonts can have first crack at adding an unknown character + set Twemoji as the viewer's fallback for all emoji blocks
2019-11-07 17:15:21 +01:00
418308bc7c
Characters can have more than one representation in LLFontFreetype
...
* By default all viewer text will use B/W glyphs
* Added temporary use_color attribute to LLTextBase for testing
2019-11-06 12:34:26 +01:00
9cfdb278de
Support for COLR/CPAL fonts
2019-10-28 23:40:41 +02:00
05566ce7a7
Font debugging aid to dump descriptors + individual textures
2019-10-27 16:41:38 +02:00
f92c1ffdb4
Merge viewer-neko
2019-05-21 20:18:40 +02:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
fd7b0e19da
SL-10610 FIXED Floaters fails to display certain symbols. Added ability to load font collections.
2019-03-19 11:16:24 +02:00
a399c67785
Merge viewer-bugsplat
2019-02-26 23:00:48 +01:00
4b99e6a1f1
SL-10252: On Windows, use $SystemRoot again, not FOLDERID_Fonts.
2018-12-17 15:23:57 -05:00
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
4a13657285
SL-10153: auto name{expression} declares an initializer_list
...
instead of a variable of type decltype(expression).
Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem()
requires new Windows #include files.
A variable with a constructor can't be declared within the braces of a switch
statement, even outside any of its case clauses.
2018-12-15 09:13:24 -05:00
c4096f670c
SL-10153: Review and rationalize fetching paths from environment.
...
Use LLStringUtil::getenv() or getoptenv() whenever we fetch a string that will
be used as a pathname.
Use LLFile::tmpdir() instead of getenv("TEMP").
As an added extra-special bonus, finally clean up $TMP/llcontrol-test-zzzzzz
directories that have been accumulating every time we run a local build!
2018-12-14 15:38:13 -05:00
f46969fec7
SL-11139 FIXED LLFontGL::getStringFromStyle() never return "NORMAL"
2019-05-13 18:17:16 +03:00
318b5e53aa
FIRE-20818: User-selectable font and size for script editor
2018-02-01 10:34:13 +01:00
c306e7ad5c
Fix script editor ignoring font selection and make it actually use Source Code Pro font
2017-11-27 16:41:40 +01:00
Ansariel