eee343dd00
Merge viewer-cougar
2019-05-08 00:54:32 +02:00
964afabae6
SL-1221 Web page displays incorrectly
...
- Fixed
2019-04-26 21:31:11 +03:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
ee22f1cbab
Merge
2019-03-24 23:21:13 +01:00
4422a4dcb1
Merged in lindenlab/viewer-bear
2019-03-19 21:41:06 +02:00
940cb4fcd5
- Correct MD5 for libndofdev.
...
- New dullahan with updated SDL2 keyboard
- Improve keyboard handling for SDL2 and make sure:
- accelerators work again.
- enter is properly forwarded as an input event.
- mousewheel messages get handled.
2019-03-19 05:23:33 +01:00
6b80caed1a
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
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
e4334809cc
Add unicodeInput implementation for Linux.
2019-03-11 00:41:28 +01:00
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
d41a40fa41
Linux; do not build vlc media plugin.
2019-03-04 21:13:20 +01:00
2fb5022185
Merge with viewer-release_linux. Open issues:
...
- switch back to OpenJPEG2
- Reimplement packaging logic for flatpak/snap/docker.
- Remove libvlc for Linux builds
- Remove gstreamer010 for Linux builds.
2019-03-04 08:04:58 +01:00
9623f835f5
Merge.
2019-03-03 17:44:24 +01:00
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
79bd596df1
Missing files for CEF
2019-01-23 13:46:12 +01:00
72c954c127
More changes to get CEF for Linux to compile.
2019-01-23 13:42:05 +01:00
05331254eb
Enable CEF for Linux.
2019-01-23 13:34:50 +01:00
464c8e2537
Add media plugin for gstreamer 1.0
2019-01-21 14:18:22 +01:00
2cfe9bc9e5
Disable gstreamer010
2019-01-17 07:56:59 +01:00
f2ea3d82f1
Merge.
2019-01-16 09:47:09 +01:00
606adaffe7
Merge viewer-bugsplat
2018-09-12 18:09:43 +02:00
9fd463bd94
remove only-partially-successful attempt to put teamcity blocks around targets
2018-09-07 09:13:57 -04:00
49c483eeb3
add more block structure to TeamCity log output for components
2018-09-05 18:07:35 -04:00
97028be9c8
Merge Firestorm LGPL Lynx
2018-05-08 20:29:47 +02:00
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02:00
8ff006f119
Linux: Disable CEF GPU usage (ref: https://bitbucket.org/NickyD/phoenix-firestorm-lgpl-linux/commits/14c936db5a02cf0f3ff24eb7f1c92136#comment-6049097 )
2018-04-22 17:15:23 +02:00
37b8d0a10e
Merge Firestorm LGPL Lynx
2018-04-12 22:58:42 +02:00
dfaea5c018
Merge Firestorm LGPL
2018-04-12 21:55:46 +02:00
546638006d
Merge viewer-media-update
2018-04-07 15:01:39 +02:00
9409fbae4a
Merge Firestorm LGPL
2018-04-07 14:59:44 +02:00
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
6a8272cfa8
Merge Firestorm LGPL
2018-04-07 11:54:06 +02:00
de9f589eec
MAINT-8501 FIXED [MAC] Web window doesn't close using 'ESC' button on the Login page.
2018-04-06 17:34:22 +03:00
f11edff29a
Linux: Do not try to compile the VLC plugin for now.
2018-04-06 12:54:09 +02:00
76e75fd220
gstreamer010, remove some deprecated glib calls and make the compiler in C++11 mode happy.
2018-04-06 12:52:51 +02:00
ee9fb80dd4
Only link against llcommon, not against ${LLCOMMON_LIBRARIES} (which does include a lot more and those cannot be added as dependencies)
2018-04-06 12:18:13 +02:00
c63b9779d7
Linux: Embed rpath in plugin libraries.
2018-03-26 23:21:21 +02:00
0bbbbdf9ed
Merge Firestorm LGPL
2018-03-25 13:37:27 +02:00
e7ef849e4c
Merge Firestorm LGPL
2018-03-21 20:23:52 +01:00
ac921c3e16
MAINT-8343 FIXED [MAC] Viewer Media Browser doubles entered Cyrillic capital letters.
2018-03-16 16:45:25 +02:00
73ea789127
MAINT-8343 FIXED [MAC] Viewer Media Browser doubles entered Cyrillic capital letters.
2018-03-16 16:45:25 +02:00
6b4f4e53dd
Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to match change in API
2018-03-15 16:12:52 -07:00
92875150b1
Merge viewer-media-update
2018-03-02 12:11:50 +01:00
278382abd7
Now CEF supports setting default page background if specifier missing from HTML, set default background color to the Linden default grey ( #282828 )
2018-03-01 09:34:25 -08:00
eaed4497da
Merge viewer-media-update
2018-02-14 21:56:53 +01:00
70bc436487
Merge viewer-neko
2018-02-12 22:28:26 +01:00
2714ff8f25
MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state
2018-02-12 19:27:09 +00:00
ade69f0d60
Autobuild and cmake configuration fixes for Linux standalone builds.
2018-02-10 19:01:12 -06:00
4e940e176f
Remove LTCG linker flags for media plugin example (cause linker warning)
2018-01-28 17:03:59 +01:00
2f8a6fbfe1
Remove GStreamer 10 that hasn't been used at all
2018-01-28 15:53:37 +01:00
8b09a997c5
Fixes for: MAINT-8244 Text in CEF cannot be selected with the mouse. MAINT-8245 Expose CEF log file and logging severity to viewer and MAINT-8246 Expose the CEF remote debugging system to the viewer
2018-01-26 17:06:19 -08:00
8ee332fb10
Bring in the very latest version of Dullahan (1.1.1024) that matches the most recent canonical Dullahan and also bump the CEF plugin version in preparation for the RC build
2018-01-22 13:30:03 -08:00
d3f544d39d
Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and 'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'
2018-01-17 16:13:19 -08:00
8f214ad00b
Fix for MAINT-7886 Resizing internal web browser window causes video playback to stop
2018-01-08 14:51:32 -08:00
5989dd1673
Bump CEF Plugin version so it can be identified as different
2018-01-08 11:22:02 -08:00
f1dc81146a
Automated merge with tip of lindenlab/viewer64
2018-01-08 09:51:51 -08:00
d97d7c5206
Fix for MAINT-8119 - this bug morphed from a packaging issue to being all about audio not playing when a media stream started. There is some as yet, unknown interaction between the volume catcher code in the CEF plugin and the VLC volume controls. The fix for now is to add a Windows call to the VLC code that sets the process volume explicitly. Later we will address the volume catcher code, move it to a common spot so both CEF and LibVLC can use the same bytes
2018-01-05 13:19:08 -08:00
6ced87c027
Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' links) as well as an improvement for maint-8100 (no error message for invalid hostname / url)
2017-12-15 16:11:29 -08:00
6166ab28dd
Pull in Dullahan 1.1.929 (multiple file picking support) and update plugin code accordingly
2017-12-14 14:27:49 -08:00
0b97c76dbb
Pull in Dullahan 1.1.925 with fix for onFileDialogCallback(..) handling that fixes MAINT-8083
2017-12-13 13:55:33 -08:00
05eba5d7b8
Pull in CEF 3203 (Dullanan 1.1.888) Chrome 62 build and re-enable WebGL
2017-11-20 16:08:15 -08:00
0a9d2037f3
Merge LL viewer release 5.1.0
2018-01-16 23:03:20 +01:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
547df251e4
Merge viewer64
2017-10-02 17:57:56 +02:00
cdba690ec9
Fix for MAINT-7787: [Alex Ivy] RC Viewers in 5.1.0 range show black background for CONTENT_TYPE_HTML. (The color we pass to CEF has 4 compontents red, blue, green and alpha. We were only passing 3 and setting the color and not the alpha. At somepoint in CEF's history the default value must have changed. Passing 0xFF for alpha too - i.e. fully opaque - fixes this)
2017-09-21 14:01:20 -07:00
dac462be06
Merge Firestorm LGPL
2017-09-06 23:59:53 +02:00
934d09e814
Hopeful fix for MAINT-7654 Ivy] Japanese can't input in CEF
2017-09-01 17:03:31 -07:00
bcacd5fa00
MAINT-6080 Fixed YouTube videos in In-Game Browser persist after closing browser window
2017-08-29 18:47:08 +03:00
e6f9a5e2db
Merge viewer64
2017-07-27 21:07:14 +02:00
9831f7fb3a
MAINT-6080 Fixed YouTube videos in In-Game Browser persist after closing browser window
2017-08-29 18:47:08 +03:00
985730a52c
Merge.
2017-05-18 17:40:24 +02:00
4df25505e4
Merge
2017-05-18 17:10:31 +02:00
18083bad5c
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-05-03 15:58:53 -04:00
614c75e110
DRTVWR-418: Silence some Mac build warnings.
...
Whatever we were trying to do with LLSharedLibs.cmake hasn't worked on the Mac
for a long time, and trying to fix it only digs up more problems. Skip it:
we've already worked around it.
Update the media_plugins_example CMakeLists.txt to eliminate some CMake
non-existent dependency warnings.
2017-05-03 15:58:21 -04:00
0c9758820c
Add NULL macOs implementation for 'MAINT-6950 Shared media a great distance away (different region even) sometimes plays at maximum volume when entering a region or moving camera slightly.' - until we can understand how to make real mac_volume_catcher work
2017-04-28 13:48:36 -07:00
8f95d9ad6e
FIX for MAINT-6950 Shared media a great distance away (different region even) sometimes plays at maximum volume when entering a region or moving camera slightly.
2017-04-27 18:04:00 -07:00
362ffb2131
Fix windows line endings because it's 2017 and our tools can't deal with it
2017-04-21 13:37:24 -07:00
b8cf14c51f
tweak shutdown procedure for example plugin to match our new methodology
2017-04-21 13:28:47 -07:00
aa85b420a1
Fix for 32bit builds of example plugin - need an extra parameter for visual studio
2017-04-19 16:59:36 -07:00
c49eeb9a62
Add back the missing pieces and updated code for the example plugin. It was useful during testing SLPlugin changes. Not shipped with release versions of viewer
2017-04-19 15:59:29 -07:00
45f67f4ed7
Hopeful fix for MAINT-7220 Windows Error Message 'SLPlugin.exe has stopped working ' appears.
2017-04-19 13:22:32 -07:00
87dd703188
dullahan for Linux.
2017-04-12 16:10:47 +02:00
b556384baf
Merge with viewer64.
2017-04-10 15:20:58 +02:00
127809e241
Merge with viewer64.
2017-04-10 15:15:11 +02:00
2acc472e1e
Fix for MAINT-7227 Drop down lists do not close after use in internal web browser. (Surprisingly large amount of changes and new version of Dullahan to support this fix)
2017-04-05 14:34:14 -07:00
f0b5a263c1
Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser scheme handler was broken)
2017-03-14 15:28:56 -07:00
884a59a2fb
Second part of fix for SL-646 Fix 'LINK : warning LNK4075: ignoring /INCREMENTAL due to '/LTCG' specification' in LibVLC, JPEGLIB etc.
2017-03-09 14:08:09 -08:00
7d1942a2b6
Remove OSX headers added for testing purposes and also some unused vars
2017-03-03 17:45:09 -08:00
398c351371
First pass at osx/macos keyboard events - simple case like google homepage is working
2017-03-03 15:32:47 -08:00
f49033efcf
Fix up slight change to Dullahan interface where we call out the platform for native keyboard injection to match OSX version
2017-03-01 16:43:15 -08:00
08940da90e
First round of changes to make the macOS 64 build work
2017-02-24 15:44:36 -08:00
bff83a7f41
Whoopps. Apologies for leaving Windows debug spam in code :(
2017-02-23 10:26:46 -08:00
f04bfdd70e
Update media plugin CEF code to match new Dullahan
2017-02-23 10:17:52 -08:00
2c8299d643
reenable support for copy/cut/paste to/from a web page
2017-02-22 19:21:55 -08:00
5534ab4e18
First round of changes to replace LLCEFLib with Dullahan. Mostly Windows changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-21 15:06:21 -08:00
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
4ff3d43ee8
Merge #7 with lgpl.
2017-02-06 12:26:14 +01:00
6d3df79ea9
Merge #3 with lgpl.
2017-02-06 12:07:45 +01:00
37974a2fa2
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-02-03 20:14:32 -05:00
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
dcae92c0a3
First batch of changes to add LibVLC media plugin to macOS viewer. Plugin fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes
2017-01-27 15:47:16 -08:00
f13c2a6d31
First set of changes to build (tests off) to build correctly against Xcode 8 and SDK 10.12
2017-01-19 14:19:46 -08:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
31be233b66
Merge viewer-lynx
2016-12-15 09:46:35 +01:00
8d34a4f8c1
MAINT-6840 start and pause doesn't wotk reliably and can get stuck
2016-12-09 18:49:48 +02:00
59f2055c8d
merge changes for latest fixes from nat
2016-12-06 12:22:55 -05:00
e6b9174bba
DRTVWR-418: Try to clean up numerous CMake CMP0046 warnings.
2016-12-06 09:50:05 -05:00
2d8ad89f33
suppress VS linker warning about unfound pdb files in media plugin
2016-12-05 17:32:38 -05:00
3d37848d01
Remove winmmshim 'hack' from project and set volume directly from CEF media plugin using Windows system call. WinMMShim was only needed for XP systems and since we no longer support XP, it is not required.
2016-12-02 16:19:34 -08:00
8a461c00f4
DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.
...
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit
builds, which on the face of it seems like a Good Thing: it permits code to be
relocated in memory, preventing collisions if two libraries happen to want to
load into overlapping address ranges.
However the way it's being specified is wrong and harmful. Passing /FIXED:NO
to the compiler command line engages /FI (Forced Include!) of a nonexistent
file XED:NO -- producing lots of baffling fatal compile errors.
Thanks Callum for diagnosing this!
2016-12-01 08:50:10 -05:00
e61320921a
DRTVWR-418: Update forwarding_api.cpp to match current API signature
...
Specifically, DriverCallback() was accepting several DWORD arguments that
should really be DWORD_PTR arguments. In a 32-bit compile, evidently that was
okay, but for 64 bits they're different sizes.
2016-11-30 11:30:44 -05:00
fc4564c415
DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor.
2016-11-23 12:08:53 -05:00
934b94e74a
DRTVWR-418: pull in new viewer-release via viewer64
2016-11-16 10:56:05 -05:00
af349febb3
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-11-16 09:17:44 -05:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
6c7a972861
DRTVWR-418: Fold windows64 into windows platform with new autobuild.
...
autobuild 1.1 now supports expanding $variables within a config file --
support that was explicitly added to address this very problem. So now the
windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE,
$AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle
most of the deltas between the windows platform and windows64.
This permits removing the windows64 platform definition from autobuild.xml.
The one remaining delta between the windows64 and windows platform definitions
was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking
ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE
instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing
LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-15 15:53:24 -05:00
7fceb3a63f
Merged in lindenlab/viewer-cleanup
2016-11-14 22:04:37 +02:00
0d0d9c4e23
Merge viewer-bear
2016-11-04 14:02:34 +01:00
6cc4a8dcd2
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-11-03 09:31:15 -04:00
07e78807a8
MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read
2016-10-27 19:48:59 +03:00
a5b60be1ff
Stop cmake warning spam for media plugins.
2016-10-14 15:09:33 +02:00
e4211ee835
Remove linker warning about LTCG switch to improve linker performance for VLC plugin
2016-10-12 00:07:57 +02:00
704c53b3c5
MAINT-5232: Merge up to VLC viewer from viewer-release
2016-10-11 10:59:17 -04:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
d2c3c2f9fe
MAINT-5232: Normalize LLSingleton subclasses.
...
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!
Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.
To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.
Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.
Fix several LLSingleton abuses revealed by making ctors/dtors private:
LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.
LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.
(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)
LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.
LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.
LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.
~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
921cfa355c
MAINT-6462 Built-in browser plays video vertically flipped
2016-09-09 11:46:50 -07:00
b6e00e7152
Windows x86; Kill quicktime plugin.
2016-08-14 21:46:00 +02:00
cf812e60d2
Do not add /FIXED:NO to windows builds.
2016-08-12 12:07:43 +02:00
9fbcb54631
Backout d8dc2724d189 as DSO loading causes issue with VLC of different API levels.
2016-08-08 19:28:42 +02:00
87f61ede8b
DSO load VLC. for Windows use the installer from http://www.videolan.org/vlc/download-windows.html (select the 64bit installer from the dropdown next to "Download VLC" for a 64 bit viewer)
2016-08-05 00:33:09 +02:00
62b661fb4f
Merge.
2016-08-04 19:00:16 +02:00
276cd251a6
GStreamer 1.0 media plugins for Windows and Linux.
2016-08-02 19:02:29 +02:00
60e13343bf
- Update CEF
...
- Remove old preload hack and y flipping debug for CEF.
- Enable 64 bit CEF for Windows x64. The plugins will be built as native 64 bit plugins now (no quicktime).
2016-08-02 14:40:56 +02:00
b547aeef03
Merge with https://bitbucket.org/lindenlab/viewer-vlc
2016-08-01 16:15:47 +02:00
781cf7fac4
remove use of "override" C++11 feature not supported on gcc 4.6
2016-07-27 09:53:20 -04:00
8cd9569cef
First pass at enabling time based media (videos) scrubbing controls
2016-07-21 21:06:06 -07:00
befb0446c5
Remove new 'buffering' state for video media - seemed like it'd be useful but it broke things
2016-07-21 15:20:00 -07:00
f0eab8b36f
Add a comment about order of operation that might be important for those that follow
2016-07-21 09:46:42 -07:00
8a25489591
MAINT-6578 Broken texture batching - fixed along with misc LibVLC plugin additions (status, titles, looping)
2016-07-20 19:54:54 -07:00
cd47f86c4a
MAINT-6578 Add back Y Flip into QuickTime plugin used in OS X to match viewer setting
2016-07-19 12:42:49 -07:00
1c4dbc64ab
MAINT-6577 FIX No sound in MOAP or browser video
2016-07-15 12:18:00 -07:00
8ae7828643
MAINT-6527 and MAINT-6528 FIX - max volume and media playing prior URLs
2016-07-11 19:46:11 -07:00
92c9ef9df5
Remove some old CEF code not needed with the new CEF libs.
2016-07-10 16:51:15 +02:00
d59ce04495
MAINT-6527 FIX -volume plays at full amount +50m away - volume was not set for media outside attenuation zone so played at random value
2016-07-07 09:10:39 -07:00
5f57257185
MAINT-6481 FIX Media controls not present
2016-07-01 14:52:51 -07:00
d63d3b4e7b
Merge.
2016-07-01 16:00:32 +02:00
3fda523e9d
32-bit C++11 fixes.
2016-06-21 22:52:20 -05:00
956f687f47
Merge with https://bitbucket.org/callum_linden/viewer-release-vlc
2016-06-04 00:49:12 +02:00
53cc5ba225
FIX MAINT-6748 content looks correct but page links are flipped vertically
2016-06-02 18:24:15 -07:00
a24e24fb50
Merged in NickyD/viewer-release-vlc (pull request #2 )
...
Linux media_plugin_libvlc
2016-06-02 14:00:36 -07:00
4796f717c2
BUG-18252 - media flipped on OS X when played in 2D browser
2016-06-02 09:49:08 -07:00
bebfe34aac
Linux: Use media_plugin_libvlc for media playback.
2016-06-01 22:33:30 +02:00
69174fcc58
Fix windows line endings
2016-05-31 14:51:40 -07:00
dca6153c23
Remove local flip (as part of resize) in QuickTime plugin for OSX
2016-05-31 09:41:37 -07:00
e982c273fd
Merge with viewer-release-vlc
2016-05-29 19:27:00 +02:00
282956e768
Some simple tidy up and added a proper URL for video test button in web content floater
2016-05-27 16:53:16 -07:00
ccfb18948d
- Make popup appear on the right screen coordinates (this was broken after the flipy switch)
...
- Make sure the popup stays until it is dismissed (no need to hold the mouse button to scroll through eg a listbox) [This needs a CEF change.)
2016-05-27 00:27:10 +02:00
8c85ec13d5
Put back QuickTime plugin code for OS X until a LibVLC version is created
2016-05-26 13:51:22 -07:00
70a38880fa
Put back QuickTime plugin code for OS X only (untested - moving code to OS X dev)
2016-05-26 12:50:54 -07:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
9c4ed8d113
Automated merge with tip of viewer-release to pick up 4.0.5
2016-05-19 11:00:03 -07:00
50ab1e57ec
Added support for some transport controls (pause/play/stop) and setting media volume level.
2016-05-16 10:58:39 -07:00
09e68a4953
Additional set of changes to use vlc-bin package
2016-05-13 16:43:18 -07:00
f0e9566b90
pull in unflipped version of LLCEFLib
2016-05-13 13:09:12 -07:00
bceafa5062
working test button in web browser floater - video inverted
2016-05-10 17:16:24 -07:00
ed73eae302
Added support for arbitrary URLs and cleaned up code
2016-05-10 13:07:34 -07:00
d15da19231
Added restart on resize - kind of works
2016-05-09 17:11:10 -07:00
e11ab0240a
Moving to a private repo
2016-05-06 17:43:47 -07:00
5b69845c86
DRTVWR-418 remove references (and files) for QuickTime
2016-04-21 11:50:55 -07:00
5a55ba8ce3
Remove references to quicktime from the plain old viewer-release build
2016-04-19 15:04:50 -07:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
a50faa943c
Merge.
2016-04-01 12:59:37 +02:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
49fa26329b
Merge Firestorm LGPL
2016-03-08 09:08:56 +01:00
faf58a81eb
Merge viewer-bear
2016-03-08 09:08:20 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
d51a5a615a
Merge
2016-03-07 10:24:39 -08:00
b0afd16e42
Merge fix for MAINT-5360
2016-03-07 18:42:17 +02:00
c7ebeb8420
merge with El Capitan and packaging fixes
2016-03-07 09:46:02 -05:00
5d325f4007
Merge viewer-quickgraphics
2016-03-05 00:37:52 +01:00
ab2c252872
Prepare for more Linux-CEF keyboard changes.
2016-03-01 01:06:29 +01:00
cb0017e821
Merge.
2016-02-29 14:23:07 +01:00
447493f484
Merge.
2016-02-29 14:15:48 +01:00
6c3ad28992
Merge Firestorm LGPL
2016-02-26 21:36:15 +01:00
0c94c3bbf0
MAINT-5360: restore builds for the EDU package
2016-02-26 10:04:47 -05:00
b785e99cff
Killing windows line endings.
2016-02-22 12:01:51 -08:00
21d8ab6fc0
Merge Firestorm LGPL
2016-02-21 02:34:31 +01:00
273b7d3a91
Remove LTCG linker flag for CEF plugin on Windows - not required
2016-02-19 20:25:04 +01:00
40e20c647d
FIRE-17816; Updated Linux keyboard handling.
2016-02-19 14:12:00 +01:00
063ec52083
Merge Firestorm LGPL tip
2016-02-13 13:43:08 +01:00
f21ee62e08
Linux: FIRE-17781 handle special keys (return, cursor, enter etc)
2016-02-10 01:18:41 +01:00
0184c2fc83
Merge with https://bitbucket.org/rider_linden/maint-4952-v-t-u
2016-01-25 15:06:34 +01:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
c41b94cd5e
Fix @#$@#$$@# windows line endings introduced via Sublime Text copy/paste
2016-01-21 16:20:51 -08:00
de81e34dc6
Merge
2016-01-21 16:12:01 -08:00
0f265ebf72
Backed out changeset 672bd34768c6
2016-01-20 17:15:02 -08:00
73c0b004d1
Backed out changeset 2e77fb7b61b6
2016-01-20 17:13:12 -08:00
65ab91ff46
MAINT-6004 (Fix) Add non blocking file upload picker support
2016-01-20 17:11:50 -08:00
28921896f1
OPEN-312: Removed add_dependency entries for items listed in target_link_libraries. Superfluous.
2016-01-20 16:08:33 -08:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
506069bf0d
Import necessary changes for MAINT-6060 from viewer-bear
2016-01-15 18:20:40 +01:00
f37fb8abe1
Pull in updated LLCEFLib with settings option to turn off WebRTC media and modify the setting in viewer code - nuclear fix for MAINT-6060
2016-01-14 17:23:51 -08:00
d726428d46
FIRE-17516 / BUG-10419 Make html dropdown lists work as expected.
2016-01-10 12:55:10 +01:00
6d918a0fb5
Merge.
2015-12-17 05:46:23 +01:00
3bf8929d93
MAINT-5966 - file download failures need feedback
2015-12-15 15:24:41 -08:00
5f1fe20e9e
Missed a commit for MAINT-5948 - enable double click
2015-12-11 16:15:34 -08:00
6c9f85bb27
Linux: swap \n with \r for CEF. Otherwise return will not work.
2016-02-21 22:33:12 +01:00
3980cdca3e
Merge
2015-12-09 07:11:36 +01:00
eb484d5051
MAINT-5909: Enable unicode text input on mac and feed that directly into the viewer. Windows fixes still required.
2015-12-03 13:32:06 -08:00
3f1a78cee9
Merge with CEF tip.
2015-11-24 15:28:05 +01:00
ee10a7bae0
Remove CEFFlash settings. In newer llceflib versions LL decided to handle this via the plugins setting.
2015-11-24 15:04:47 +01:00
cc0faa3424
Refrain from sending right mouse button events - crashes OS X - and we don't need them
2015-11-23 12:01:32 -08:00
94ea5dce50
pull in llceflib changes for user agent, flash plugins and pdf
2015-11-20 17:34:46 -08:00
f2a6e0f89c
Fix javascript_enabled && plugins_enabled (wrong media class) and pull in new LLCEFLib
2015-11-19 16:39:40 -08:00
32691c4416
initial support for dropdown menus/select widgits
2015-11-18 18:17:50 -08:00
311b376ab5
Update SetCookie code for new LLCEFLib API and add support for shoing/hising developer console (Inspector)
2015-11-16 16:09:40 -08:00
0a47b491de
Merged callum_linden/viewer-cef into default
2015-11-13 16:39:51 -08:00
df29aab81b
Throw away any incomplete llsd messages that may have get sent on CR
2015-11-13 16:38:35 -08:00
c2ad041c23
Encode keyboard event for reconstruction in the plugin.
2015-11-13 16:22:34 -08:00
f8050dbac2
Fix MAINT-5832 Add /LTCG flag to linker for media_plugin_cef.dll to avoid linker restarts
2015-11-11 16:28:11 -08:00
70c7043bf4
Merge with head
2015-11-11 09:54:00 -08:00
f563ef6100
Add callback for when CEF asks to shutdown
2015-11-11 09:53:51 -08:00
a9a3cafa91
Adding plugin goodbye response to quicktime plugin.
2015-11-11 08:55:18 -08:00
148de7ceeb
Have the media_cef plugin post goodbye back to the plugin.
2015-11-10 14:26:47 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
66848f7a94
Undo the clobbering that the PR did :)
2015-11-09 11:53:09 -08:00
b260451633
Merge.
2015-11-09 12:21:49 +01:00
5449ae73b3
MAINT-5754: Finish key modifier experiment. Still not working.
2015-11-07 12:09:08 -08:00
8b8331feab
Pull in LLCEFLib with working OS X cookies and tweak keyboard code to build - needs some love to work...
2015-11-06 16:55:30 -08:00
bd817f6f42
MAINT-5754: Basic keyboard functionality on the Mac. Still incomplete
2015-11-06 14:12:30 -08:00
8e4ab13c4a
Merge.
2015-10-25 19:09:16 +01:00
e97f886dcc
Merge.
2015-10-25 17:46:36 +01:00
16cd296e30
MAINT-5775 FIX Split out cookies and cache directories into separate folders and move cache to same place as viewer cache
2015-10-22 13:24:43 -07:00
8c74ed2a58
Fix windows line endings
2015-10-21 09:05:19 -07:00
2a899b49dd
MAINT-5711 FIX profiles and marketplace are asking for a login each session
2015-10-19 18:43:48 -07:00
22ddbb96f3
Linux volume_catcher. (from webkit).
2015-10-14 14:37:35 +02:00
80ea570112
Merge.
2015-10-13 17:03:27 +02:00
fde9ebe1e8
CEF update.
2015-10-12 11:32:59 +02:00
506e7271a7
CMake fixes for mac build.
2015-10-09 11:51:10 -07:00
295d392b1c
MAINT-5715, MAINT-5717, MAINT-5718: Replace the the volume catcher that was removed with the QT viewer. Addresses panning and fading issues, teleport and viewer mute controls.
2015-10-09 10:09:18 -07:00
46817fcbd3
Merged in lindenlab/viewer-lynx
2018-04-12 21:24:36 +03:00
8c67f588da
Merged in lindenlab/viewer-release
2018-04-12 21:22:22 +03:00
ebcee8d7e7
MAINT-5703 fix - add observer to media plugin so MEDIA_LOCATION_CHANGED events get propagated throughout system
2015-10-06 15:24:57 -07:00
2cdc06af0c
Merge.
2015-10-05 17:09:58 +02:00
cb7f84a470
MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced.
2015-10-02 11:14:28 -07:00
ca871f25e9
Fix OS X missing scope qualifiers
2015-10-01 09:57:53 -07:00
a0c0bc6b40
Update CEF media plugin to reflect changes in LLCEFLib
2015-09-30 16:34:49 -07:00
21f5136522
Merge.
2015-09-28 00:29:23 +02:00
Ansariel