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

243 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
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
Andrey Lihatskiy 9ac1a63a41 Merge branch 'master' into DRTVWR-530-maint 2021-08-10 06:43:59 +03:00
Ansariel ff816141e3 Comment out setting CEF volume until there is an updated custom CEF lib 2021-08-09 14:30:44 +02:00
Ansariel ca4e15c930 Merge branch 'DRTVWR-531' of https://bitbucket.org/lindenlab/viewer 2021-08-09 14:27:13 +02:00
Callum Prentice a242edc99d Merge with Master after Viewer Release (also fixed some glaring automerge screw ups) 2021-07-19 17:43:19 -07:00
Callum Prentice 95b26d3bec Fix for SL-15560 pages with undefined html render with gray background instead of white in CEF v91 2021-07-12 14:17:04 -07:00
Callum Prentice 3602d64a09 Fix for SL-15559 PDF files do not load in CEF v91 2021-07-12 12:50:34 -07:00
Callum Prentice c308c1cf59 Pull in updated Dullahan and use it for for: Fix SL-14888 Media on a Prim should not show JS (about to unload) popups 2021-05-18 08:45:57 -07:00
Callum Prentice c705126d0b Fixes SL-14897 Disable Flash support in the embedded browser 2021-05-14 15:21:06 -07:00
Ansariel 9826ae6967 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-05-13 23:26:52 +02:00
Andrey Lihatskiy a442f8b451 Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint" 
This reverts commit 07456abe92, reversing
changes made to 8a33636e8f.
 2021-05-13 20:29:01 +03:00
Ansariel a703746196 Revert screwing up the browser background once again... 2021-05-11 21:12:04 +02:00
Ansariel fbeaed7c76 Comment this out until the get our own Dullahan updated 2021-05-11 21:10:26 +02:00
Ansariel cd3b20552c Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-05-11 21:09:19 +02:00
Andrey Kleshchev 5cde118ec8 SL-14664 Added zoomout and sizeall 
Remade code to use getCursorFromString
 2021-04-27 23:08:54 +03:00
Andrey Kleshchev e5136cd19b SL-14664 Added 'alias' 2021-04-27 20:51:23 +03:00