Commit Graph

43 Commits (master)

Author SHA1 Message Date
Ansariel 950fa11bcb Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_search.xml
2025-08-25 11:26:30 +02:00
Andrey Kleshchev d5f748c91c #3223 Trim coroutine queues a little 2025-08-20 12:53:53 +03:00
Ansariel 4e2bfd7327 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llcallingcard.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/zh/strings.xml
2025-03-19 15:23:20 +01:00
Andrey Kleshchev 4e5dce7949 #3736 LLExperienceCache shutdown crash 2025-03-18 17:26:45 +02:00
Ansariel 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
Andrey Lihatskiy 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
Beq 5d863ef500 FIRE-33046 - Reduce logging for experience capability to debug (OpenSim) 2023-07-03 22:48:29 +01:00
Ansariel 78daeae740 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-02-15 10:22:20 +01:00
Andrey Kleshchev 24d4517458 SL-14807 Viewer crashes when creating an experience 2021-02-10 01:10:36 +02:00
Ansariel 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
Andrey Kleshchev 4ebba5b918 SL-13891 Coroutine creation was requested on exit 2020-09-02 17:10:24 +03:00
Anchor 244e0dc001 [DRTVWR-476] - conflicts with a mac macro 2020-03-25 18:40:44 -04:00
Nicky e6e66a953e Merge with viewer-vs2017 2019-06-06 14:37:27 +02:00
Anchor 20051e9906 [DRTVWR-476] - conflicts with a mac macro 2019-05-20 05:13:02 -07:00
Ansariel 7c41871639 Merge viewer-lynx 2017-04-14 12:42:28 +02:00
Mnikolenko Productengine 5e926ece20 MAINT-7245 Use Experience Box in LSL Editor will not show as checked if containing object is in another region 2017-03-30 16:30:01 +03:00
Ansariel 477c3f1601 Fix log getting spammed with experience requests from other grids 2016-10-13 10:17:46 +02:00
Rider Linden 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
Rider Linden cf835a80cd Pref instance() over getInstance() 2015-09-18 16:36:49 -07:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Rider Linden 97236a42ca MAINT-5507: Remove HTTPClient and related cruft. 2015-09-14 11:15:23 -07:00
Rider Linden a471ae72e4 Experience Profile to coroutines and Experience cache. 2015-09-04 13:13:16 -07:00
Rider Linden ec998b4c6e Region experience allow/disallow. 2015-09-03 16:14:40 -07:00
Rider Linden c08072a050 Moved group experiences into experience cache. Use coros and new HTTP libs. 2015-09-03 11:10:32 -07:00
Rider Linden 346f885473 Moved find experience into experience cache (moved cache recording into cache and out of UI) changed from responder to coroutine. 2015-09-02 15:16:37 -07:00
Rider Linden 6c9610b4e4 Move associated experience fetching into the ExperienceCache as a coro remove the responder. 2015-09-02 11:50:26 -07:00
Rider Linden 96e343b49b MAINT-5575: Convert the Experience cache into a coro based singleton.
--HG--
branch : MAINT-5575
2015-09-01 16:13:52 -07:00
Rider Linden 4b3269c94d Some initial changes to convert the experience cache to a singleton
--HG--
branch : MAINT-5575
2015-08-31 07:27:13 -07:00
Rider Linden 99e56eedab MAINT-5575: Begin conversion to Singleton<> for Experience Cache. Commited on branch so that I don't trigger a build of it until I'm ready.
--HG--
branch : MAINT-5575
2015-08-28 16:55:33 -07:00
Cho 200788c344 Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536 2014-06-24 22:43:23 +01:00
Cho c88b237473 Updated LLExperienceCache::LLExperienceResponder to work with updated LLCurl::Responder interface, to fix ACME-1532 and ACME-1525 2014-06-20 04:19:45 +01:00
dolphin 74dcc04e69 Updated experience cache to get a const reference to xp data 2014-03-17 15:57:15 -07:00
dolphin a0b8c3e029 Windows lets you erase with a const iterator but linux does not. 2014-03-12 11:49:17 -07:00
dolphin 7b9817cbcc Fixed a bug that lost callbacks if > 10 experiences were looked up at a time. 2014-03-10 10:15:19 -07:00
dolphin f5b7343238 Updated position of the edit button the experience profile and added the Grid Wide tag. 2013-09-17 19:58:20 -07:00
dolphin 51c01f5294 More explicitnexx for the mac build
Also update the experience cache when the update returns.
2013-09-09 11:19:41 -07:00
dolphin 257110c11e Added new fields to the experience cache.
Experience profile moved to it's own floater, will probalby be moving again.
XP profile displays most data, though the presentation is not final
Fixed a bug with the XP selection combobox in the script editor
2013-08-21 15:43:09 -07:00
dolphin d5308c19f7 Fixed up expiration code for the experience cache 2013-03-13 10:24:30 -07:00
dolphin 61874872a7 Updated experience cache to latest web service api
Added new CAP request for experiences the avatar can sign
2013-02-13 14:20:35 -08:00
dolphin 179e944f45 Updated client to use new caps
brought over server changes to llExperienceCache
2012-12-18 16:06:00 -08:00
dolphin@dolphin-THINK.lindenlab.com 2566e0d08f Added code for simulator integration.
Added signals for cache update callbacks.
Added expiration timers for cached experiences.
2012-11-26 08:42:23 -08:00
dolphin@dolphin-THINK.lindenlab.com 2cde962d5d Test populating the experience keys UI with avatar name data. 2012-11-19 08:06:42 -08:00
dolphin@dolphin-THINK.lindenlab.com 723ab8b108 Merge 2012-11-14 14:12:25 -08:00