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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Andrey Kleshchev
|
a701165522
|
SL-16047 Strip unused includes
|
2021-10-18 17:36:14 +03: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 |
|
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 |
|
Andrey Lihatskiy
|
9ac1a63a41
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-08-10 06:43:59 +03: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 |
|
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 |
|
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 |
|
Andrey Kleshchev
|
8b3f4b56f9
|
SL-14664 Increase range of supported cursors on prim's media
|
2021-04-26 23:55:45 +03:00 |
|
Callum Prentice
|
2aea7cfc25
|
Pull in new version of Dullahan with support for setting the host process path, tweak viewer manifest so it copies the SwiftShader folder (required but may be a Chromium bug) and improve background color matching
|
2021-02-24 15:20:39 -08:00 |
|
Andrey Kleshchev
|
8213cc896c
|
SL-3704 Give plugins some time to terminate
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
|
2020-08-10 20:44:52 +03:00 |
|
Andrey Kleshchev
|
383352c61c
|
SL-13567 Users should have separate CEF contexts
|
2020-07-17 19:00:58 +03:00 |
|
Callum Prentice
|
9c78928311
|
Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume fall-off settings updates
|
2020-04-28 10:57:17 -07:00 |
|
andreykproductengine
|
6ea01a8c4a
|
Merge fix
|
2019-10-16 14:04:53 +03:00 |
|
AndreyL ProductEngine
|
d7f73cfc5b
|
Backed out changeset: eb99f42d0fdc
|
2019-10-15 21:15:32 +03:00 |
|
AndreyL ProductEngine
|
885c56a660
|
Downstream merge from lindenlab/viewer-bear
|
2019-10-15 20:36:12 +03:00 |
|
AndreyL ProductEngine
|
2f7b606202
|
Backed out changeset: 8e228364f324
|
2019-09-14 05:14:24 +03:00 |
|
AndreyL ProductEngine
|
548d688adf
|
Backed out changeset: b4182ee25942
|
2019-09-14 05:14:07 +03:00 |
|
AndreyL ProductEngine
|
ddbe9583ff
|
Backed out changeset: a6398f90389a
|
2019-09-14 05:13:53 +03:00 |
|
AndreyL ProductEngine
|
cdcdc4b3e3
|
Merged in lindenlab/viewer-bear
|
2019-08-13 21:59:37 +03:00 |
|
AndreyL ProductEngine
|
823cef92ed
|
Merged in lindenlab/viewer-lynx
|
2019-08-13 21:58:10 +03:00 |
|
AndreyL ProductEngine
|
ef423bfb81
|
Merged in lindenlab/viewer-release
|
2019-08-13 21:54:23 +03:00 |
|
AndreyL ProductEngine
|
e047bb09ba
|
SL-10962 Support for suppressing JavaScript dialogs in the media plugin code
|
2019-07-25 17:50:40 +03:00 |
|
andreykproductengine
|
23591b8ab7
|
SL-3704 Plugin exit issues
|
2019-07-01 17:28:58 +03:00 |
|
AndreyL ProductEngine
|
16437e771b
|
Merged in DRTVWR-492
|
2019-06-20 00:14:45 +03:00 |
|
callum_linden
|
d278699b7b
|
Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along with some minor compatibility changes
|
2019-06-11 20:28:54 -07:00 |
|
maxim_productengine
|
ffae378ab1
|
SOCIAL-231 Show tooltips for links and images im media browser
|
2019-06-11 17:38:04 +03:00 |
|
callum_linden
|
7bce446b28
|
Changes from @andreyk for improved mouse scroll wheel performance and pull in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157
|
2019-06-10 14:09:31 -07:00 |
|
ruslantproductengine
|
964afabae6
|
SL-1221 Web page displays incorrectly
- Fixed
|
2019-04-26 21:31:11 +03:00 |
|
callum@gmail.com
|
72f21b399e
|
Pull in a change to Dullahan that allows user to specify flag that lets video/audio autoplay like it did before Chrome 70? (Dullahan v1.1.1320). Also sets a flag in media plugin CEF code to change the settings from false (default) to true
|
2019-03-18 15:36:16 -07:00 |
|
AndreyL ProductEngine
|
4422a4dcb1
|
Merged in lindenlab/viewer-bear
|
2019-03-19 21:41:06 +02:00 |
|
Mnikolenko ProductEngine
|
42ec90a877
|
SL-9846 FIXED [MAC] Empty space is inserted into the text field while switching fields by pressing 'Tab' in Viewer browser
|
2019-03-07 15:27:31 +02:00 |
|
maxim_productengine
|
0abd3cfc9c
|
SL-10473 FIXED [OSX] Checkboxes become invisible after ticking on them in the built-in browser
|
2019-03-01 10:42:48 +02:00 |
|
AndreyL ProductEngine
|
46817fcbd3
|
Merged in lindenlab/viewer-lynx
|
2018-04-12 21:24:36 +03:00 |