diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
| commit | b2f1e8899b32f681e13705d684db9a93d18450ae (patch) | |
| tree | 70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/llcommon/workqueue.cpp | |
| parent | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff) | |
| parent | 65764a5b7bab573b261386aca11a7967a21ec2d2 (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/llcommon/workqueue.cpp')
| -rw-r--r-- | indra/llcommon/workqueue.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp index 9138c862f9..8b7b97a1f9 100644 --- a/indra/llcommon/workqueue.cpp +++ b/indra/llcommon/workqueue.cpp @@ -127,9 +127,7 @@ void LL::WorkQueueBase::error(const std::string& msg) void LL::WorkQueueBase::checkCoroutine(const std::string& method) { - // By convention, the default coroutine on each thread has an empty name - // string. See also LLCoros::logname(). - if (LLCoros::getName().empty()) + if (LLCoros::on_main_coro()) { LLTHROW(Error("Do not call " + method + " from a thread's default coroutine")); } |