summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2024-12-10 09:09:07 -0800
committerGitHub <noreply@github.com>2024-12-10 11:09:07 -0600
commit5f9fe87808bdf48186ed295e735bf2dced7e4e33 (patch)
treea1895e88f53b9c3623706ca49a418be831577cff
parentb76ea8f1d71db6e8626be18cab101535731d7d74 (diff)
Fix for assert (and potential crash) in LLAvatarPropertiesProcessor coroutine (#3253)
-rw-r--r--indra/newview/llavatarpropertiesprocessor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index 299cc5ed64..6277e65b2d 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -41,6 +41,7 @@
#include "lltrans.h"
#include "llui.h" // LLUI::getLanguage()
#include "message.h"
+#include "llappviewer.h"
LLAvatarPropertiesProcessor::LLAvatarPropertiesProcessor()
{
@@ -367,7 +368,11 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur
avatar_data.picks_list.emplace_back(pick_data["id"].asUUID(), pick_data["name"].asString());
}
- inst.notifyObservers(avatar_id, &avatar_data, type);
+ LLAppViewer::instance()->postToMainCoro(
+ [avatar_id, avatar_data, type]()
+ {
+ LLAvatarPropertiesProcessor::instance().notifyObservers(avatar_id, (void*) &avatar_data, type);
+ });
}
void LLAvatarPropertiesProcessor::processAvatarLegacyPropertiesReply(LLMessageSystem* msg, void**)