Skip to content

#3436 Better handling of 'teleport_strings.xml' parsing failure #3437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2025
Merged

#3436 Better handling of 'teleport_strings.xml' parsing failure #3437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions indra/newview/llagent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading