e275de5a82
SL-13497 Fixed error in logic
2021-02-11 13:00:48 +01:00
661d595967
SL-13497 Fixed error in logic
2021-02-10 22:31:38 +02:00
24b2f60d1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-06 00:18:07 +01:00
49690e5b8b
Trap one specific fail code and force refresh of pollset
...
There may well be others that we should do this for but for now this eliminates the worst offender
2021-02-04 22:12:28 +00:00
52b3bb404c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 12:38:03 +01:00
543e5dc1d2
Improve logging of looping apr poll error in slplugin
...
won't change the issues but it should make the logging sane
2021-01-14 01:57:09 +00:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01: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
78a79267e8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 09:30:26 +02:00
000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
7925f7c7c3
Merge remote-tracking branch 'fs/master' into linux-updates
2020-08-15 21:00:44 +02:00
46bd337096
FIRE-30019: Remove clamp on shared media size on Linux
2020-08-14 18:32:11 -05: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
705b5568c4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 23:49:28 +02:00
e5677c891a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 20:15:15 +02:00
15b13608ba
Merge branch 'master' into linux-updates
2020-07-23 23:40:41 +02: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
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
383352c61c
SL-13567 Users should have separate CEF contexts
2020-07-17 19:00:58 +03:00
187b1e0d6e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llpanelpermissions.cpp
# indra/newview/llviewerregion.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_attachment_self.xml
# indra/newview/skins/default/xui/en/menu_avatar_self.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2020-07-09 10:08:42 +02: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
77f56fa7bf
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
2020-05-31 15:27:02 +02:00
d1f6441751
Merge branch 'master' into linux-updates
2020-05-30 18:00:33 +02:00
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02: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
a135b5b428
Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017
2019-12-21 13:14:51 +01:00
7f9bce5ada
Merge branch 'master' into fs-vs2017
2019-12-21 01:52:19 +01:00
5e23499660
Merge branch 'master' into linux-updates
2019-12-18 10:34:06 +01:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
218c0a1d4f
Automated merge with ssh://bitbucket.org/nat_linden/viewer-llsingleton
2019-12-13 13:20:21 -05:00
24499ac66f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2019-12-13 12:30:03 -05:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
55d7ac5e81
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.
2019-12-06 16:31:49 -05:00
3789a192dc
Merge viewer-lynx
2019-10-16 22:48:57 +02:00
0ff935ca3c
Brought back the changes from @andreyk for improved mouse scroll wheel performance (previously 8e228364f324)
2019-10-16 01:37:15 +03:00
b1ae8def22
Merge Firestorm LGPL
2019-10-15 23:34:02 +02:00
885c56a660
Downstream merge from lindenlab/viewer-bear
2019-10-15 20:36:12 +03:00
d59cd13de1
Merge viewer-bear
2019-10-09 22:43:10 +02: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
1d585c0c40
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2019-08-22 20:00:44 -04: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
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
23591b8ab7
SL-3704 Plugin exit issues
2019-07-01 17:28:58 +03:00
e2620e973f
Merge viewer-neko
2019-06-20 09:50:07 +02: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
e6e66a953e
Merge with viewer-vs2017
2019-06-06 14:37:27 +02:00
ebcfbf277e
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2019-06-05 14:15:15 -04:00
84406ee896
Merge with lgpl.
2019-05-12 15:45:24 +02:00
e6970af7a1
Merge Firestorm LGPL
2019-05-09 19:52:27 +02:00
9c9601ce8a
[DRTVWR-476] - fix linking
2019-05-08 18:57:33 -06: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
d686d2025b
Merge Firestorm LGPL
2019-05-03 19:48:09 +02:00
3443ae7b26
Merge Firestorm LGPL
2019-05-02 16:48:56 +02:00
5cdd039956
Merge Firestorm LGPL
2019-04-25 18:30:00 +02:00
27ebf0dc63
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
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
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
6e70616cf2
Merge Firestorm LGPL
2019-03-01 18:58:47 +01:00
c96314964a
Merge Firestorm LGPL
2019-03-01 17:36:52 +01:00
36cb6933e6
Merged in lindenlab/viewer-release
2019-03-01 02:24:00 +02:00
ad9487a8ae
Use snap.${SNAPNAME}.LL rather than snap.${SNAPNAME}./LL to test if this makes apparmor happy.
2019-01-24 10:16:28 +01:00
a193c9e723
A snap package cannot use /dev/shm/* but rather is restricted to /dev/shm/snap.${SNAP_NAME}.* Adapt shm names to that in case snap runtime is detected.
2019-01-24 00:19:54 +01:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
f2ea3d82f1
Merge.
2019-01-16 09:47:09 +01: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
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02: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
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
e97c25531c
Merge viewer-neko
2018-05-25 22:05:19 +02:00
3888de9439
Merge
2018-05-22 13:16:37 -07:00
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02: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
89b4e0b251
Merge.
2018-04-15 17:36:54 +02:00
033b626959
Merge
2018-04-13 14:50:07 -07:00
dfaea5c018
Merge Firestorm LGPL
2018-04-12 21:55:46 +02:00
8c67f588da
Merged in lindenlab/viewer-release
2018-04-12 21:22:22 +03:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
991a621658
Linux: Link SLPlugin with -Wl,--as-needed
2018-04-06 17:12:00 +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
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
Andrey Lihatskiy