diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-02-19 14:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-19 14:06:26 +0200 |
| commit | 8c1f00eebc6863c39d0143aeb7e37c68459d454f (patch) | |
| tree | b3c32a7800e8424d20145d198d548cac550b7956 /indra/newview/llagent.cpp | |
| parent | fd0227c52c1e45fc3ae7abd90a14d7077b1cfdd1 (diff) | |
| parent | 8114850e947f2a76e54912524722c48f22851228 (diff) | |
Merge Forever Fps into 2025.03
Merge Forever Fps into 2025.03
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 26c080bf89..8756baa04a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4879,10 +4879,19 @@ void LLAgent::parseTeleportMessages(const std::string& xml_filename) LLXMLNodePtr root; bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root); - if (!success || !root || !root->hasName( "teleport_messages" )) + if (!success) { + LLError::LLUserWarningMsg::showMissingFiles(); LL_ERRS() << "Problem reading teleport string XML file: " - << xml_filename << LL_ENDL; + << xml_filename << LL_ENDL; + return; + } + + if (!root || !root->hasName("teleport_messages")) + { + LLError::LLUserWarningMsg::showMissingFiles(); + LL_ERRS() << "Invalid teleport string XML file: " + << xml_filename << LL_ENDL; return; } |