e17c906698
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
ac2f20fc03
Use thread pool to create plugin processes to reduce created/destroyed threads and fix various crashes ( #2079 )
2024-07-22 16:10:19 +03:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07:00
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
ca63f18bf2
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmath/llvolume.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# scripts/messages/message_template.msg.sha1
2024-05-10 14:12:41 +02:00
7fc5f7e649
#1354 Make coroutines use LLCoros::Mutex instead of LLMutex ( #1356 )
...
* #1354 Make coroutines use LLCoros::Mutex instead of LLMutex
* #1354 Fix some more unsafe coroutine executions.
* #1354 Implement changes requested by Nat
2024-05-02 10:57:39 -05:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
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
62ffcf193d
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
2024-01-26 13:17:18 +01:00
f7f9601567
Got hero probes rendering from the camera.
...
DRTVWR-583
2023-07-17 15:05:47 -07:00
b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
823dbc8805
SL-18801 Crash at LLPluginProcessParent::pollTick()
...
Looks like pollTick tried to call an already dead process
2022-12-07 19:33:47 +02:00
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
d1265cda36
SL-17425 Crash when closing two dependent floaters
...
dependent_it in llfloater was not valid after dependent floater removed itself from the list
2022-05-20 01:35:40 +03:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
66b5e49a79
SL-16161 Don't process new plugin messages on shutdown #2
2021-10-11 19:26:45 +03:00
c1943e5efb
SL-16161 Don't process new plugin messages on shutdown
...
Some pending messages might try to update non-existing view or cause a pop up, neither should be avaliable by this point, so just don't process them
2021-10-08 23:56:43 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
dde3c2c7a8
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-05 14:03:30 +02:00
d875f80900
SL-14988 Plugin process creation can cause a notiecable delay
2021-05-25 03:31:50 +03:00
fa26f5eaa2
SL-14988 Viewer freezes when opening any CEF based window
...
Don't block main thread if possible
2021-05-24 15:59:52 +03:00
d313d7021f
SL-15200: Add LLApp::sleep(duration) methods.
...
Two sleep() methods: one accepting F32Milliseconds, or in general any LLUnits
time class; the other accepting any std::chrono::duration.
The significant thing about each of these sleep() methods, as opposed to any
freestanding sleep() function, is that it only sleeps until the app starts
shutdown. Moreover, it returns true if it slept for the whole specified
duration, false if it woke for app shutdown.
This is accomplished by making LLApp::sStatus be an LLScalarCond<EAppStatus>
instead of a plain EAppStatus enum, and by making setStatus() call set_all()
each time the value changes. Then each new sleep() method can call
wait_for_unequal(duration, APP_STATUS_RUNNING).
Introducing llcond.h into llapp.h triggered an #include circularity because
llthread.h #included llapp.h even though it didn't reference anything from it.
Removed. This, in turn, necessitated adding #include "llapp.h" to several .cpp
files that reference LLApp but had been depending on other header files to
drag in llapp.h.
2021-05-17 13:37:13 -04:00
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
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
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
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
92c9ef9df5
Remove some old CEF code not needed with the new CEF libs.
2016-07-10 16:51:15 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +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
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
3f1a78cee9
Merge with CEF tip.
2015-11-24 15:28:05 +01:00
059925eafb
Added code to initiate controlled shutdown of plugins with timeouts for misbeahving plugin.
2015-11-10 13:45:30 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
a13d2f7f70
MAINT-4009: Patching a leak of LLPluginSharedMemory objects from the LLPluginProcessParent class.
2014-05-20 21:03:13 +01:00
cef556c152
More correction in llplugin ...
2014-06-10 11:23:07 +02:00
87d479e723
Fix merge error in llplugin.
2014-06-10 10:48:22 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Ansariel