summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRye <rye@lindenlab.com>2024-11-08 15:14:12 -0500
committerGitHub <noreply@github.com>2024-11-08 15:14:12 -0500
commitc2ed9d85a4bbf1345f0f39899f0293d54592033c (patch)
treecba4596eb4e35ee91c4db11a9096d244f799394f
parent30ca4f02f503248212f7d1301ae2ff1835cf79bd (diff)
parent8b496685f27a05cb97ac782424f0c9574db02676 (diff)
Merge pull request #3060 from secondlife/rye/coroassert
Fix assert when retrieving data while mousing over minimap avatar dots
-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..a108f5872c 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -31,6 +31,7 @@
// Viewer includes
#include "llagent.h"
#include "llagentpicksinfo.h"
+#include "llappviewer.h"
#include "lldateutil.h"
#include "llviewergenericmessage.h"
#include "llstartup.h"
@@ -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([=]()
+ {
+ LLAvatarData av_data = avatar_data;
+ instance().notifyObservers(avatar_id, &av_data, type);
+ });
}
void LLAvatarPropertiesProcessor::processAvatarLegacyPropertiesReply(LLMessageSystem* msg, void**)