Dave Houlton
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
Dave Houlton
029b41c041
Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"
...
This reverts commit 5188a26a85 , reversing
changes made to 819088563e .
2021-11-15 09:25:35 -07:00
Nat Goodspeed
834e7ca088
SL-16202: Use large WorkQueue size limits for mainloop and General.
...
Give ThreadPool and WorkQueue the ability to override default
ThreadSafeSchedule capacity.
Instantiate "mainloop" WorkQueue and "General" ThreadPool with very large
capacity because we never want to have to block trying to push to either.
2021-11-04 17:18:57 -04:00
Nat Goodspeed
11afa09ea3
SL-16220: Add LL::ThreadPool class and a "General" instance.
...
ThreadPool bundles a WorkQueue with the specified number of worker threads to
service it. Each ThreadPool has a name that can be used to locate its
WorkQueue.
Each worker thread calls WorkQueue::runUntilClose().
ThreadPool listens on the "LLApp" LLEventPump for shutdown notification. On
receiving that, it closes its WorkQueue and then join()s each of its worker
threads for orderly shutdown.
Add a settings.xml entry "ThreadPoolSizes", the first LLSD-valued settings
entry to expect a map: pool name->size. The expectation is that usually code
instantiating a particular ThreadPool will have a default size in mind, but it
should check "ThreadPoolSizes" for a user override.
Make idle_startup()'s STATE_SEED_CAP_GRANTED state instantiate a "General"
ThreadPool. This is function-static for lazy initialization.
Eliminate LLMainLoopRepeater, which is completely unreferenced. Any potential
future use cases are better addressed by posting to the main loop's WorkQueue.
Eliminate llappviewer.cpp's private LLDeferredTaskList class, which
implemented LLAppViewer::addOnIdleCallback(). Make addOnIdleCallback() post
work to the main loop's WorkQueue instead.
2021-10-22 11:36:31 -04:00
Dave Houlton
aa358035a3
DRTVWR-528 remove wrapper code for RAD telemetry library
2021-09-03 17:53:43 -07:00
Andrey Lihatskiy
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
Andrey Lihatskiy
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
Andrey Lihatskiy
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
Andrey Lihatskiy
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
Andrey Lihatskiy
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
Andrey Lihatskiy
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
Andrey Kleshchev
cfb6ca569b
SL-15168 Viewer side functionality for guidebook window opening
2021-05-06 02:46:42 +03:00
Andrey Lihatskiy
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
Andrey Kleshchev
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
Dave Houlton
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
Andrey Lihatskiy
c54382b760
Merge branch 'master' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
2021-04-29 20:04:33 +03:00
Andrey Lihatskiy
6da0a6873b
Merge branch 'SL-14862' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llstartup.cpp
2021-04-22 18:26:54 +03:00
Andrey Kleshchev
3780c86538
SL-15028 Move guidebook code into own flaoter
...
To help with dispatcher and unify code
2021-04-16 01:24:29 +03:00
Andrey Kleshchev
669dd6adbe
SL-14906 Open Guidebook floater on first login
2021-04-15 01:23:29 +03:00
Andrey Kleshchev
8772aed531
SL-15013 Block List very often is empty when I log in
...
It looks like these messages were often getting lost.
These requests have higher, more visible impact if lost, so doubled retries.
As per Ansariel's suggestion moved request to a less busy stage.
2021-04-13 22:48:11 +03:00
Dave Houlton
3cad30d9ee
Merge branch 'master' into DV525-merge-6.4.18
2021-04-01 14:49:07 -06:00
Andrey Kleshchev
4c889f7e52
Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01 21:34:44 +03:00
Andrey Lihatskiy
b52384d9ef
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/lltoolpie.cpp
2021-04-01 20:49:26 +03:00
Andrey Lihatskiy
9fe758e8bc
Merge branch 'master' into DRTVWR-516-maint
2021-04-01 20:45:16 +03:00
Andrey Lihatskiy
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
Andrey Kleshchev
e48ce28278
SL-14936 Do not create a saved outfit automatically for new users
2021-03-16 20:32:50 +02:00
Brad Payne (Vir Linden)
92a17bf53b
SL-14862 - tab logging
2021-03-10 17:49:06 +00:00
Dave Houlton
303feae305
Merge branch 'master' v6.4.17 into DRTVWR-525
2021-03-10 09:34:16 -07:00
Andrey Lihatskiy
19ff86fabd
Merge branch 'master' into DRTVWR-522-maint
2021-03-09 22:00:08 +02:00
Andrey Lihatskiy
9a36df5763
Merge branch 'master' into DRTVWR-514-keymappings
2021-03-09 21:59:14 +02:00
Andrey Lihatskiy
ec824a16d5
Merge branch 'master' into DRTVWR-516-maint
2021-03-09 21:57:53 +02:00
Andrey Lihatskiy
bb17e4b78e
Merge branch 'master' into DRTVWR-515-maint
2021-03-09 21:56:14 +02:00
Andrey Lihatskiy
a68c527eae
Merge branch 'master' into DRTVWR-518-ui
2021-03-09 21:55:37 +02:00
Brad Payne (Vir Linden)
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a04 , reversing
changes made to 00c47d079f .
2021-03-08 13:56:16 +00:00
Dave Houlton
363bc9d9d0
Merge branch 'master' v 6.4.15 into DRTVWR-525
2021-03-02 14:25:36 -07:00
Andrey Lihatskiy
be83a004db
Merge branch 'master' into DRTVWR-522-maint
2021-03-02 21:42:51 +02:00
Andrey Lihatskiy
9c8bc82ce6
Merge branch 'master' into DRTVWR-518-ui
2021-03-02 21:41:46 +02:00
Andrey Lihatskiy
135d54a4ff
Merge branch 'master' into DRTVWR-516-maint
2021-03-02 21:41:37 +02:00
Andrey Lihatskiy
35550e36db
Merge branch 'master' into DRTVWR-515-maint
2021-03-02 21:41:26 +02:00
Andrey Lihatskiy
f271ba3277
Merge branch 'master' into DRTVWR-514-keymappings
2021-03-02 21:41:13 +02:00
Andrey Kleshchev
24d4517458
SL-14807 Viewer crashes when creating an experience
2021-02-10 01:10:36 +02:00
Andrey Kleshchev
0d324bb24d
SL-12422 Clear cert cache to enshure there is no carry-over between failed logins
2021-01-25 21:13:47 +02:00
Mnikolenko Productengine
dd887e24d5
SL-14342 FIXED Crash: "Uninitialized param singleton LLVoiceClient"
2020-11-17 14:15:06 +02:00
Andrey Lihatskiy
ac3db22abc
Merge branch 'master' into DRTVWR-518-ui
2020-11-13 18:27:29 +02:00
Andrey Lihatskiy
0bba892bb0
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
Dave Houlton
21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
Callum Prentice
9b1d9150c2
Merge branch 'master' into DRTVWR-519
2020-11-11 13:22:35 -08:00
Mnikolenko Productengine
8aa41b9e1c
SL-14203 add menu items to open Linden Homes and Premium Membership web pages
2020-11-06 19:41:21 +02:00
Ptolemy
f22c85cb41
SL-13424 Add Rad Games Tools local Telemetry profiler support
2020-10-15 23:33:13 -07:00
Andrey Lihatskiy
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00