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

584 Commits (719a2d31dc29f3260b45c89862dd67f314331ed5)

Author SHA1 Message Date
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
Ansariel 62b11fc825 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/llappviewer.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolfocus.h
#	indra/newview/llviewerhelp.h
#	indra/newview/llvoicevivox.h
 2023-02-04 13:39:11 +01:00
Callum Prentice 3185bdea27 DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer 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-26 14:45:45 -08: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
Callum Linden cbb7480ca7 Fix merge conflicts after auto merge 2023-01-20 16:23:41 -08:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Kitty Barnett 7ebaa2d2e5 Merge branch contribution/emoji into DRTVWR-489-emoji 2022-11-09 23:25:02 +01:00
Kitty Barnett 62d62abe9c [FIXED] Using the Windows emoji picker or pasting text containing emojis doesn't create emoji segments (=emoji size is same size as the text size) 
-> Partial revert of 063fe59
 2022-11-09 00:08:43 +01:00
Kitty Barnett c40d3351d5 Commit immediately if the user already typed a full shortcode 2022-11-02 19:08:02 +01:00
Kitty Barnett 8d08f417dc Show tooltip when hovering over an emoji text segment (currently will show its shortcode) 2022-10-23 16:29:03 +02:00
Kitty Barnett 063fe5953a Create a separate segment for emoji characters so that we can display them in a slightly larger font size than the surrounding text 2022-10-23 16:26:49 +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
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 1f3b96dd9c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 19:56:19 +02:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Ansariel 22b72a328b Slight optimization 2022-09-14 14:20:40 +02:00
Zi Ree a5cb6dab38 Linux/SDL2 - IME support for composing Japanese, Chinese, etc. input. Tested with ibus/mozc giving over-the-top editing with candidate clause selection, Media pages in the internal web browser do not yet have accurate input placement 2022-09-14 11:19:51 +02:00
Ansariel 3d7c5c52d9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:26:51 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Andrey Lihatskiy 55da4ea8bb Merge branch 'master' into DRTVWR-565-maint-P 
# Conflicts:
#	indra/newview/llfloateroutfitsnapshot.cpp
 2022-08-31 00:36:22 +03:00
Ansariel 18341f0d76 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 23:19:12 +02:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 00:16:09 +03:00
Kitty Barnett bab70f6f15 Review + resolve minor issues 2022-08-29 00:01:43 +02:00
Kitty Barnett 5440464a9c Merge branch 'contribution/emoji' 2022-08-28 00:08:38 +02:00
Ansariel ec1ef8c495 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-17 17:50:46 +02:00
Ansariel c85bcbd7de FIRE-29425: User-selectable font and size for notecards 2022-08-16 18:27:13 +02:00
Ansariel 9c4c27a56f Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-01 22:07:39 +02:00
Andrey Kleshchev 4c3f343799 SL-17045 LSL editor cursor position desynchronization 
1. Fixed cursor position calculations
2. Fixed selection rect calculation
 2022-07-26 19:43:04 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02:00
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03:00
Ansariel 455b750cde Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-03-02 12:04:09 +01:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	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-03-02 10:12:19 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# 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-03-01 13:41:42 +02:00
Andrey Lihatskiy e70fe3a50d Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-02-28 22:01:18 +02:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
Ansariel 9c3cdd37f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-16 13:43:53 +01:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 78f9a28191 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542 2022-01-13 21:12:09 +01:00
Ansariel 453c99af39 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-10 23:15:08 +01:00
Ansariel 9c0973f787 FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window 2022-01-04 15:00:41 +01:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00