661d595967
SL-13497 Fixed error in logic
2021-02-10 22:31:38 +02:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
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
ae48c7c8b3
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
2020-07-21 11:54:11 +03:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
383352c61c
SL-13567 Users should have separate CEF contexts
2020-07-17 19:00:58 +03:00
52ff68ce51
SL-13497 Sometimes plugin process isn't terminated correctly.
2020-07-06 20:13:01 +03:00
77cf4588df
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
...
following release of D512.
2020-06-23 22:03:43 -04:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
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
b5bb0794f0
[DRTVWR-476] - fix linking
2020-03-25 18:39:20 -04:00
5e7df752a6
DRTVWR-494: Use std: 🧵 :id for LLThread::currentID().
...
LLThread::currentID() used to return a U32, a distinct unsigned value
incremented by explicitly constructing LLThread or by calling LLThread::
registerThreadID() early in a thread launched by other means. The latter
imposed an unobvious requirement on new code based on std::thread. Using
std:🧵 :id instead delegates to the compiler/library the problem of
distinguishing threads launched by any means.
Change lots of explicit U32 declarations. Introduce LLThread::id_t typedef to
avoid having to run around fixing uses again if we later revisit this decision.
LLMutex, which stores an LLThread::id_t, wants a distinguished value meaning
NO_THREAD, and had an enum with that name. But as std:🧵 :id promises
that the default-constructed value is distinct from every valid value,
NO_THREAD becomes unnecessary and goes away.
Because LLMutex now stores LLThread::id_t instead of U32, make llmutex.h
#include "llthread.h" instead of the other way around. This makes LLMutex an
incomplete type within llthread.h, so move LLThread::lockData() and
unlockData() to the .cpp file. Similarly, remove llrefcount.h's #include
"llmutex.h" to break circularity; instead forward-declare LLMutex.
It turns out that a number of source files assumed that #include "llthread.h"
would get the definition for LLMutex. Sprinkle #include "llmutex.h" as needed.
In the SAFE_SSL code in llcorehttp/httpcommon.cpp, there's an ssl_thread_id()
callback that returns an unsigned long to the SSL library. When LLThread::
currentID() was U32, we could simply return that. But std:🧵 :id is very
deliberately opaque, and can't be reinterpret_cast to unsigned long.
Fortunately it can be hashed because std::hash is specialized with that type.
2020-03-25 15:28:17 -04:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
0ff935ca3c
Brought back the changes from @andreyk for improved mouse scroll wheel performance (previously 8e228364f324)
2019-10-16 01:37:15 +03:00
885c56a660
Downstream merge from lindenlab/viewer-bear
2019-10-15 20:36:12 +03:00
2f7b606202
Backed out changeset: 8e228364f324
2019-09-14 05:14:24 +03:00
548d688adf
Backed out changeset: b4182ee25942
2019-09-14 05:14:07 +03:00
ddbe9583ff
Backed out changeset: a6398f90389a
2019-09-14 05:13:53 +03:00
7a64e8f8bf
Merge viewer-release 6.2.5
2019-08-13 15:24:38 -07:00
cdcdc4b3e3
Merged in lindenlab/viewer-bear
2019-08-13 21:59:37 +03:00
823cef92ed
Merged in lindenlab/viewer-lynx
2019-08-13 21:58:10 +03:00
23591b8ab7
SL-3704 Plugin exit issues
2019-07-01 17:28:58 +03:00
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
ffae378ab1
SOCIAL-231 Show tooltips for links and images im media browser
2019-06-11 17:38:04 +03:00
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
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
aefb0503aa
Merged in lindenlab/viewer-release
2019-05-08 00:09:53 +03:00
20ca495012
SL-10811 - [Render][OSX] Google’s search results page is not fully displayed in the Media Browser if HiDPI is enabled.
...
SL-10813 - [Render][OSX] HiDPI browser has black bars on the sides.
Fixed.
2019-04-24 18:20:34 +03:00
36cb6933e6
Merged in lindenlab/viewer-release
2019-03-01 02:24:00 +02:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
e1a76999c3
Merge
2019-02-28 16:37:47 -08: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
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
3888de9439
Merge
2018-05-22 13:16:37 -07:00
5219e6c455
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
2018-04-17 19:25:28 +03:00
033b626959
Merge
2018-04-13 14:50:07 -07:00
8c67f588da
Merged in lindenlab/viewer-release
2018-04-12 21:22:22 +03:00
aba5777d74
Merge
2018-02-28 21:53:34 +00:00
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
08cb3fbe32
Automated merge with tip of viewer-release
2018-02-14 10:56:31 -08:00
2714ff8f25
MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state
2018-02-12 19:27:09 +00: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
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
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
Andrey Lihatskiy