diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-11-06 01:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 01:21:52 +0200 |
| commit | e37996269d8d874c73b4de22f965a1db4a4c75aa (patch) | |
| tree | 519b13ee175849ba28311857841d163cceb3f719 | |
| parent | ef4b74e3162ed3ea3757cddb1a90ca572d021024 (diff) | |
| parent | 8a15edb915dbe41288d6da8d003ef5274ef0a3e3 (diff) | |
Merge pull request #3017 from secondlife/maxim/viewer-2884
#2884 fix for stalls caused by coro suspend
| -rw-r--r-- | indra/llcommon/llcoros.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lleventcoro.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lualistener.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 5a3cbd2ef1..d188520652 100644 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -472,7 +472,7 @@ LLBoundListener LLCoros::getStopListener(const std::string& caller, // This overload responds to viewer shutdown and to killreq(consumer). return LLEventPumps::instance().obtain("LLCoros") .listen( - LLEventPump::inventName(caller), + caller, [consumer, cleanup](const LLSD& event) { auto status{ event["status"].asString() }; diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp index 33db27a116..2ad0aa5eff 100644 --- a/indra/llcommon/lleventcoro.cpp +++ b/indra/llcommon/lleventcoro.cpp @@ -168,7 +168,7 @@ postAndSuspendSetup(const std::string& callerName, // notice the pending LLApp status first. LLBoundListener stopper( LLCoros::getStopListener( - listenerName, + LLEventPump::ANONYMOUS, LLCoros::instance().getName(), [&promise, listenerName](const LLSD& status) { diff --git a/indra/llcommon/lualistener.cpp b/indra/llcommon/lualistener.cpp index 94085c6798..188445a460 100644 --- a/indra/llcommon/lualistener.cpp +++ b/indra/llcommon/lualistener.cpp @@ -40,7 +40,7 @@ LuaListener::LuaListener(lua_State* L): // Listen for shutdown events. mShutdownConnection( LLCoros::getStopListener( - "LuaState", + LLEventPump::ANONYMOUS, mCoroName, [this](const LLSD&) { |