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

258 Commits (b49c3a083b73f6a5762f353f618a2e1fe25cf690)

Author SHA1 Message Date
Hecklezz 66de754017 [FIRE-36132] Fixed Linux Keyboard input in CEF 2025-11-22 00:25:15 +10:00
Ansariel b99cf9fb86 Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/cmake/APR.cmake
#	indra/cmake/Audio.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/Meshoptimizer.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/llaudio/llvorbisencode.cpp
#	indra/llcommon/linden_common.h
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llfasttimer.cpp
#	indra/llcommon/llfasttimer.h
#	indra/llcommon/llfile.cpp
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llkdu/llimagej2ckdu.h
#	indra/llkdu/llkdumem.h
#	indra/llplugin/slplugin/CMakeLists.txt
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llopenglview-objc.mm
#	indra/llwindow/llwindowmacosx-objc.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/media_plugins/cef/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/viewer_manifest.py
 2025-09-05 14:55:37 +02:00
Rye e629bf05d6 Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers 2025-08-27 22:36:55 -04:00
Callum Prentice bebd1b208e Bring in Dullahan 1.20.0 and by that, CEF 139.0.28. Update the CEF media plugin accordingly to take account of Dullahan cache changes 2025-08-22 17:10:29 -07:00
Callum Prentice 454f93eaf8 A ??) sequence was mis-interpreted by the pre-commit hooks as a trigraph sequence. 2025-08-11 18:50:34 -07:00
Callum Prentice 1bbad3fd00 This commit introduces CEF 139 which works now that each media instance has its own cache/cookies folder (previous commit). It also changes the Test Bookmarks page to a heavily updated one with new links and a filter/search mechanism 2025-08-11 18:45:15 -07:00
Callum Prentice 356b682f61 First part of work for #4498. This change forces each CEF instance to have it's own cache/cookie folder underneath the parent cef_cache folder. The whole cef_cache folder structure is purged at startup (before the parent being created at the first media instance creation) 2025-08-07 15:28:48 -07:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
 2024-05-22 19:04:52 +02:00
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master' 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
 2024-05-16 14:10:55 +02:00
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 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 a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
 2024-02-06 17:58:20 +01:00
Lars Næsbye Christensen da967da9c7 Rename OS X to macOS, mostly in comments 
We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.
 2024-01-11 19:11:33 +02:00
Zi Ree c25f9daef4 Linux: build fix, CEF update killed numpad controls for the moment 2023-11-05 18:31:07 +01:00
Zi Ree 45aef2c318 Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled 2022-09-20 19:29:39 +02:00
Ansariel cf85e854e5 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-09-15 21:14:13 +02:00
Callum Linden 3248eb87dc SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin 2022-09-14 14:52:31 -07:00
Ansariel 6d09c9ff89 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 12:37:05 +02:00
Zi Ree 2ab6dd9344 Linux SDL2 - make keyboard input work for the CEF plugin, still a couple funky keys left to deal with later 2022-08-03 13:56:01 +02:00
Nicky dad5b8e78e Example code for SDL2/CEF. 2022-08-03 10:43:05 +02:00
Ansariel 9300613edc Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-06-29 21:57:31 +02:00
Andrey Kleshchev a7e4428d06 SL-17452 CEF not working in non-ASCII install path 
Fix ASCII specific function
 2022-05-21 00:04:17 +03:00
Nicky 617c01e26b Linux; remove setting of proxy info till dullahan gets an update. 2022-03-01 13:20:43 +01:00
Ansariel 95db09d8d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:31:49 +01:00
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:51:52 +02:00
Ansariel 496156073b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 18:56:31 +01:00
Ansariel 39f272278c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp
 2021-12-16 10:20:56 +01:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
 2021-12-15 21:16:47 +02:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00
Ansariel ced9423261 Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer 2021-11-16 12:17:26 +01:00
Andrey Lihatskiy 0505c6ebbb Merge branch 'master' into DRTVWR-534 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:21:55 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
 2021-11-16 00:54:53 +02:00
Ansariel b14d460dca Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-11-10 21:21:51 +01:00
Andrey Kleshchev a701165522 SL-16047 Strip unused includes 2021-10-18 17:36:14 +03:00
Ansariel 8af72281f5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-12 13:34:50 +02:00
Ansariel 110a4a0dff Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-12 12:48:39 +02:00
Ansariel 0c23720e73 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-12 12:47:04 +02:00
Callum Linden 454c7f4543 Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxy 2021-10-07 20:16:54 +03:00
Nicky abd5f7a899 Linux; Update dullahan once more. 2021-09-28 23:58:53 +02:00
Ansariel 1bc442ac0b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-09-20 12:29:47 +02:00
Nicky cef73bce8f Linux; Disable GPU once more, as once again having it on caues isues on some systems. 2021-09-16 13:35:44 +02:00
Nicky 035befac70 Linux; Update CEF. 2021-09-12 01:24:08 +02:00
Ansariel 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02:00
Ansariel 82a9b2ef62 Remove traces of old custom Dullahan lib 2021-08-23 19:02:59 +02:00
Callum Prentice 0c89e67eb5 DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one. 2021-08-20 08:28:48 -07:00
Nicky 1dfdcb8566 Linux; do not call setOnJSBeforeUnloadCallback till we get a new dullahan for Linux. 2021-08-10 15:40:23 +02:00