summaryrefslogtreecommitdiff
path: root/indra/newview/lleventpoll.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2025-04-25 16:40:38 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2025-04-25 16:40:38 +0300
commita7759f370435bdd971724aa799160fa28ae112b5 (patch)
treed5c63558fd34311ba70a4f0ceafcca8a8565f0bd /indra/newview/lleventpoll.cpp
parentd9468ecc59f75363d9b57a9c1f7419cc3c42599b (diff)
parent89f817194305243cb28499c70819656b8172dfa8 (diff)
Merge branch 'release/2025.04' into 2025.04-chat-mention
Diffstat (limited to 'indra/newview/lleventpoll.cpp')
-rw-r--r--indra/newview/lleventpoll.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index c05a7fef44..c6fea1ba82 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -101,10 +101,18 @@ namespace Details
void LLEventPollImpl::handleMessage(const LLSD& content)
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_APP;
- std::string msg_name = content["message"];
+ std::string msg_name = content["message"].asString();
LLSD message;
- message["sender"] = mSenderIp;
- message["body"] = content["body"];
+ try
+ {
+ message["sender"] = mSenderIp;
+ message["body"] = content["body"];
+ }
+ catch (std::bad_alloc&)
+ {
+ LLError::LLUserWarningMsg::showOutOfMemory();
+ LL_ERRS("LLCoros") << "Bad memory allocation on message: " << msg_name << LL_ENDL;
+ }
LLMessageSystem::dispatch(msg_name, message);
}