b35e4d26d1
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/lleventpoll.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoicewebrtc.cpp
2024-08-10 12:51:51 +02:00
ae7f7cd670
Replace boost::shared_ptr with std in voice classes
2024-08-07 14:19:49 +03: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
a666e640c8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-08 00:10:01 +01:00
c573d27e5b
SL-20611 Followup -- fix for water rendering twice. Add comments around LLEventPoll hack.
2023-12-01 14:49:22 -06:00
68875523e0
SL-20611 Incorporate water haze into new post effect atmospherics goodness
2023-11-30 12:01:45 -06:00
6ae8248f5d
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/de/floater_about_land.xml
# indra/newview/skins/default/xui/de/floater_avatar_textures.xml
# indra/newview/skins/default/xui/de/floater_camera.xml
# indra/newview/skins/default/xui/de/floater_camera_presets.xml
# indra/newview/skins/default/xui/de/floater_linkreplace.xml
# indra/newview/skins/default/xui/de/floater_people.xml
# indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/de/floater_preview_trash.xml
# indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/de/panel_group_roles.xml
# indra/newview/skins/default/xui/de/panel_login.xml
# indra/newview/skins/default/xui/de/panel_notification_list_item.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/de/panel_preferences_sound.xml
# indra/newview/skins/default/xui/de/panel_progress.xml
# indra/newview/skins/default/xui/de/panel_region_environment.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/de/teleport_strings.xml
# indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
# indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/es/floater_camera.xml
# indra/newview/skins/default/xui/es/floater_god_tools.xml
# indra/newview/skins/default/xui/es/floater_people.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/es/panel_group_roles.xml
# indra/newview/skins/default/xui/es/panel_landmark_info.xml
# indra/newview/skins/default/xui/es/panel_login.xml
# indra/newview/skins/default/xui/es/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/es/teleport_strings.xml
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/fr/floater_camera.xml
# indra/newview/skins/default/xui/fr/floater_camera_presets.xml
# indra/newview/skins/default/xui/fr/floater_forget_user.xml
# indra/newview/skins/default/xui/fr/floater_linkreplace.xml
# indra/newview/skins/default/xui/fr/floater_people.xml
# indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/fr/floater_preview_trash.xml
# indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/fr/menu_viewer.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/fr/panel_group_roles.xml
# indra/newview/skins/default/xui/fr/panel_login.xml
# indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
# indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/fr/panel_progress.xml
# indra/newview/skins/default/xui/fr/panel_region_environment.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/fr/teleport_strings.xml
# indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_camera.xml
# indra/newview/skins/default/xui/it/floater_camera_presets.xml
# indra/newview/skins/default/xui/it/floater_god_tools.xml
# indra/newview/skins/default/xui/it/floater_media_browser.xml
# indra/newview/skins/default/xui/it/floater_people.xml
# indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/it/floater_stats.xml
# indra/newview/skins/default/xui/it/menu_login.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/it/panel_group_roles.xml
# indra/newview/skins/default/xui/it/panel_landmark_info.xml
# indra/newview/skins/default/xui/it/panel_login.xml
# indra/newview/skins/default/xui/it/panel_notifications_channel.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/it/panel_place_profile.xml
# indra/newview/skins/default/xui/it/panel_preferences_sound.xml
# indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/it/panel_region_environment.xml
# indra/newview/skins/default/xui/it/sidepanel_appearance.xml
# indra/newview/skins/default/xui/it/strings.xml
# indra/newview/skins/default/xui/it/teleport_strings.xml
# indra/newview/skins/default/xui/ja/floater_camera.xml
# indra/newview/skins/default/xui/ja/floater_camera_presets.xml
# indra/newview/skins/default/xui/ja/floater_people.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_roles.xml
# indra/newview/skins/default/xui/ja/panel_login.xml
# indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
# indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/pt/panel_group_roles.xml
# indra/newview/skins/default/xui/pt/panel_landmark_info.xml
# indra/newview/skins/default/xui/pt/panel_login.xml
# indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
# indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
a1931d8cc4
SL-18735 Using "Find original" in main inventory tab breaks inventory view
...
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
2023-01-16 20:42:20 +02:00
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
e75519ef0e
SL-15093 Crash nanov2_free_to_block #2
...
Mostly converted some boost pointers to std ones
Made ~LLNotificationChannelBase() more explicit to get a bit more data on location of another crash that likely happens when cleaning mItems
2021-05-31 19:36:36 +03:00
5fe5b43f2f
SL-14217 Shutdown crash
...
Don't process EventQueueGet responses from server when disconected
2020-10-28 12:11:49 +01:00
5a6ef4e85e
SL-14217 Shutdown crash
...
Don't process EventQueueGet responses from server when disconected
2020-10-28 12:34:30 +02:00
218e719d24
Merge viewer-eep
2018-12-13 21:14:20 +01:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
80ec7f6b35
Restore old event poll behavior only for OpenSim
2017-12-11 19:41:02 +01:00
a15350a545
Merge Firestorm LGPL
2016-09-28 14:51:18 +02:00
ba47ea023e
Decrease severity of event poll log message
2016-09-23 09:38:48 +02:00
304b9726de
Merge Firestorm LGPL
2016-08-15 16:42:36 +02:00
57da9bcd1b
merge from viewer-release
2016-08-15 09:52:06 -04:00
2eadb31a05
Merge cleanup
2016-08-13 23:35:56 +02:00
0054c93c3f
Merge Firestorm LGPL
2016-08-11 00:17:47 +02:00
b8f2d2801b
Merge Firestorm LGPL
2016-07-26 18:42:13 +02:00
067b1c232e
Merge viewer-lynx
2016-07-13 10:16:47 +02:00
a6b8e0c0e0
Backed out changeset 947e044fa5f1 (FIRE-19557; Make sure LLEventPollImpl does not get destroyed as long as the coroutine needs the this pointer.) as LL fix is coming up
2016-07-13 09:06:52 +02:00
664f1f9b6f
STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer allocation.
2016-07-12 11:07:05 -07:00
c0407af8ab
STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer allocation.
2016-07-12 11:07:05 -07:00
2c68d02395
MAINT-6565: Grab a shared pointer and encapsulate it into the bind call in place of this. Ensures that the impl is not deleted while the coroutine is active.
2016-07-11 16:33:11 -07:00
3239139709
Backed out changeset 947e044fa5f1 (Crash fix in LLEventPollImpl) for fix from Linden Lab
2016-07-26 10:17:17 +02:00
75abd53121
Restore pre-coro behavior for event polling (60s timeout, no retries)
2016-07-26 10:14:52 +02:00
c1c9b3d74e
MAINT-6565: Grab a shared pointer and encapsulate it into the bind call in place of this. Ensures that the impl is not deleted while the coroutine is active.
2016-07-11 16:33:11 -07:00
ea49fe4d82
Merge bento-box
2016-07-07 09:46:49 +02:00
cba0bb3038
SL-109 - little bit of log spam cleanup
2016-07-05 16:18:50 -04:00
59b3d6fff6
FIRE-19557; Make sure LLEventPollImpl does not get destroyed as long as the coroutine needs the this pointer.
2016-07-04 21:49:40 +02:00
2aad1ecd90
FIRE-19415; Warn about messages with no body element.
2016-06-04 18:11:28 +02:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
2763bbd975
Initial changes for Vivox/Azumarill merge. Lots of temporary code and conditional compile switches. Begin switch from statemachine to coroutine.
2015-12-04 14:27:22 -08:00
429729b592
MAINT-5804, MAINT-5890: Incorrectly trapping timeout in event poll and canceling coroutine before it's finished.
2015-11-19 17:15:17 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bbb9d4f21b
MAINT-5732: Change to the way event polling handles error conditions and cancel calls.
...
Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr
Started minor refactor in the materials manager into coroutines (unfinished)
2015-10-14 17:46:24 -07:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
f1be78f7e2
MAINT-5351: Finish messy merge restoring 'selfless' changes.
2015-07-11 08:06:15 -04:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
b262ded7e0
MAINT-5351: Remove 'self' parameter from coroutine functions.
...
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
0d3fb07bfa
Remove vestigial httpclient.h include from files that no longer need it.
2015-06-03 16:04:40 -07:00
3e004ce66e
Updated feature manager downloader to coroutine.
...
Added "raw" coroutine handler (returns raw result as LLSD::Binary) and split out the guts of the get, put, etc methods.
Moved getStatusFromLLSD from HttpCoroHandler into HttpCorutineAdapter
2015-05-11 16:52:02 -07:00
794cdbc2ae
Issue with LL_WARNS_IF sort out later.
2015-04-09 17:14:39 -07:00
e28a5b6ead
Added LL_WARNS_IF to llerror.h
...
If the coro is given something other than a map from the http then move the return into a body section.
Changed windlight to use a coroutine and the new LLCore::Http libarary.
Extra comments into Event Polling.
2015-04-09 16:46:41 -07:00
Ansariel