d19e6abc5e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
2025-03-01 01:09:19 +01:00
ecac92c60c
#3627 Warn user about low memory on bad_alloc
2025-02-27 17:43:16 +02:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02: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
45dc1a63f0
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
2024-01-12 14:18:34 +01:00
7c8907522f
replace boost library to standard
2024-01-08 23:29:21 +02:00
3fed8d9fc4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llpathfindingnavmesh.cpp
2023-05-17 23:33:50 +02:00
53ed0ec70c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# doc/contributions.txt
2023-05-17 23:57:11 +03:00
7bcb251661
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llmessage/llcoproceduremanager.cpp
# indra/llui/lllayoutstack.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-04-21 12:08:40 +02:00
16712d2437
SL-19493 Fix inventory log spam
2023-03-30 23:44:40 +03:00
8d154eaa8c
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
2023-01-13 15:19:29 +01:00
769bf46a3f
SL-14399: Ditch overflow queue LLViewerAssetStorage::mCoroWaitList.
...
mCoroWaitList was introduced to prevent an assertion failure crash:
LLCoprocedureManager never expects to fill LLCoprocedurePool::mPendingCoprocs
queue. The queue limit was arbitrarily set to 4096 some years ago, but in
practice LLViewerAssetStorage can post way more requests than that.
LLViewerAssetStorage checked whether the target LLCoprocedureManager pool's
queue looked close to full, and if so posted the pending request to its
mCoroWaitList instead. But then it had to override the base LLAssetStorage
method checkForTimeouts() to continually check whether pending tasks could be
moved from mCoroWaitList to LLCoprocedureManager.
A simpler solution is to enlarge LLCorpocedureManager::DEFAULT_QUEUE_SIZE, the
upper limit on mPendingCoprocs. Since mCoroWaitList was an unlimited queue,
making DEFAULT_QUEUE_SIZE "very large" does not increase the risk of runaway
memory consumption.
2022-12-07 09:50:02 -05:00
94534f4c88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:25:06 +02:00
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
c36098c881
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 21:20:43 +01:00
35781178ec
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-02 21:19:39 +01:00
d07c89ee6d
Squelch some coproc logspam
2021-02-19 10:15:37 +01:00
f55bab800a
FIRE-30765: Fix more coproc pool creation threading crashes - yay!
2021-02-19 01:17:25 +01:00
1cf4be8423
Turn this into a warning
2021-02-18 19:32:16 +01:00
425a971604
Don't LL_ERRS out if trying to create a copro pool a second time
2021-02-15 12:30:22 +01:00
78daeae740
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-15 10:22:20 +01:00
f06ebd054b
SL-14807 Missed a pool init in unused constructor, additional protections
2021-02-14 20:42:30 +02:00
4a3e32e732
SL-14807 Adjusted unit test
2021-02-11 02:49:13 +02:00
24d4517458
SL-14807 Viewer crashes when creating an experience
2021-02-10 01:10:36 +02:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
fe1ecfe7cc
FIRE-30731: Make use of LL's ugly SOC-violating workaround for out-of-the-blue fix for ExpCache coroutine pool creation crash - presumably...
2021-02-01 22:37:41 +01:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
71bca1d860
SL-14399 Enqueue into 'LLViewerAssetStorage::assetRequestCoro' failed
2020-11-26 22:27:48 +02:00
f9b6380689
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-14 23:57:09 +02:00
5172f5d6d6
SL-14037 BugSplat Crash #646590 : Enqueue failed in AIS
2020-10-01 22:36:52 +03:00
fe10f171d3
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +02:00
dc0e4941e2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-09 19:27:48 +02:00
a42045994d
SL-13555 'Second Life quit unexpectedly' error message
2020-08-28 01:30:37 +03:00
2f52a37e6a
SL-13811 Crash on coroprocedure
2020-08-28 00:33:25 +03:00
ed9a0bd2e6
SL-13811 Crash on coroprocedure
...
Coroprosedure should stop on 'stop' exception
2020-08-21 12:57:21 +02:00
e4350fb9ef
SL-13811 Crash on coroprocedure
...
Coroprosedure should stop on 'stop' exception
2020-08-20 23:44:45 +03:00
6239f5b5d6
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 18:26:28 +02:00
8ac53f8a76
Revert "Attempt to fix the VAAssetStorage pool creation issue" because of LL's upcoming ewwwww-hackme-fix
...
This reverts commit e7f5063944
2020-08-18 18:25:34 +02:00
58ba75f6dd
SL-13783 Workaround for enqueueCoprocedure() crash #2
2020-08-18 16:23:59 +03:00
fa0cc7b6d2
Merged in SL-13783 and SL-13789
2020-08-17 20:49:56 +00:00
80fe2157fe
SL-13783 Workaround for enqueueCoprocedure() crash with asset storage
2020-08-17 21:52:28 +03:00
e7f5063944
Attempt to fix the VAAssetStorage pool creation issue
2020-08-13 20:33:26 +02:00
ffd96d181a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2020-08-11 18:18:07 +02:00
cca777fdf5
SL-13679 Event pump DupListenerName crash at login
2020-07-24 23:53:57 +03:00
27715d4d03
Merge remote-tracking branch 'll/d476' into fs-eep-vs2017-d476
2020-05-21 06:54:02 +02:00
b7d60f650d
DRTVWR-476: Fix LLCoprocedurePool::enqueueCoprocedure() shutdown crash.
2020-05-20 10:44:34 -04:00
13b4bd5832
Make sure coproc gets destroyed after each iteration.
...
Making coproc scoped to the for loop will make sure the destructor gets
called every loop iteration. Keeping it's scope outside the for loop
means the pointer keeps valid till the next assigment that happens
inside pop_wait_for when it gets assigned a new value.
Triggering the dtor inside pop_wait_for can lead to deadlock when inside
the dtor a coroutine tries to call enqueueCoprocedure (this happens).
enqueueCoprocedure then will try to grab the lock for try_push but this
lock is still held by pop_wait_for.
2020-05-19 21:27:16 +02:00
003ba682a1
DRTVWR-476: Clean up reverting to boost::fibers::buffered_channel.
2020-05-19 14:38:14 -04:00
Ansariel