89b4e0b251
Merge.
2018-04-15 17:36:54 +02:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
3ea9a01423
Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class).
2018-04-06 09:49:32 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
eaed4497da
Merge viewer-media-update
2018-02-14 21:56:53 +01:00
08cb3fbe32
Automated merge with tip of viewer-release
2018-02-14 10:56:31 -08: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
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
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05: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
32cbc9f98b
Merge viewer64
2017-11-05 12:46:02 +01:00
19bb6fd33e
MAINT-7081: Mention nghttp2 library wherever it must be mentioned.
2017-09-27 15:27:30 -04:00
bcf5dc079a
merge changes for 5.0.7-release
2017-08-23 09:19:59 -04:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
b974482e5a
Merge Firestorm LGPL
2017-06-19 21:30:14 +02:00
446eaa8375
Merge with phoenix-firestorm-lgpl
2017-06-18 22:37:11 +02:00
d3a1c4cda4
MAINT-7462 check pointer to avoid allocation crash in llpluginclassmedia
2017-06-06 16:06:28 +03:00
dbad1e3a5d
MAINT-7462 check pointer to avoid allocation crash in llpluginclassmedia
2017-06-07 21:19:34 +02:00
4df25505e4
Merge
2017-05-18 17:10:31 +02: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
28824e68ff
Turn off message that is expected behavior and will fill up the logs/console
2017-04-19 15:55:26 -07:00
95c7feba07
Remove the scary 32bit exception handler that patches kernel32.dll since it was (a) scary, (b) didn't work on 64 bit and (c) likely the cause of a lot of anti-virus false positives
2017-04-19 15:54:26 -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
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
0a7fd3686a
Look for logcontrol-dev.xml in the user settings directory
2017-02-27 09:52:50 -05:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01: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
934b94e74a
DRTVWR-418: pull in new viewer-release via viewer64
2016-11-16 10:56:05 -05: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
0d0d9c4e23
Merge viewer-bear
2016-11-04 14:02:34 +01: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
1bbbc85e46
And another merge with https://bitbucket.org/lindenlab/viewer-vlc/
2016-10-05 22:34:46 +02:00
56953b146a
Fix MAINT-6730 Media audio does not play when Media volume slider is set to max
2016-10-05 13:15:25 -07:00
a5fa0eb223
Merge with https://bitbucket.org/lindenlab/viewer-vlc/
2016-10-05 20:29:29 +02:00
1be15b3d3a
Log volume control values for debugging
2016-09-30 15:20:37 -07:00
62b661fb4f
Merge.
2016-08-04 19:00:16 +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
92c9ef9df5
Remove some old CEF code not needed with the new CEF libs.
2016-07-10 16:51:15 +02: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
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
cb0017e821
Merge.
2016-02-29 14:23:07 +01:00
2700f7994e
FIRE-17517; LD_PRELOAD libcef.so when launching a plugin that will dso-load media_plugin_cef. Reasoning is that libcef.so is bild with tcmalloc and thus will cause all kind of havok if not preloaded. Hopefully cefbuilds will stop doing this soon enough (see https://bitbucket.org/chromiumembedded/cef/issues/1827 ) and this can be reverted.
...
Alternative is to rebuild CEF each and every time for x86 and x64 when it is updated.
See also:
http://jira.phoenixviewer.com/browse/FIRE-17517
https://lists.secondlife.com/pipermail/opensource-dev/2015-July/010106.html
https://bitbucket.org/chromiumembedded/cef/issues/1827/tcmalloc-should-be-disabled-in-linux-osx
2016-02-07 23:47:58 +01:00
0184c2fc83
Merge with https://bitbucket.org/rider_linden/maint-4952-v-t-u
2016-01-25 15:06:34 +01: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
e93c405105
CEF plugin for Windows x64.
2015-12-19 15:24:29 +01:00
6d918a0fb5
Merge.
2015-12-17 05:46:23 +01:00
Nicky