Skip to content

Commit 2ee845c

Browse files
committed
#3436 Better handling of 'teleport_strings.xml' parsing failure
1 parent ebae60c commit 2ee845c

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

indra/newview/llagent.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4879,10 +4879,19 @@ void LLAgent::parseTeleportMessages(const std::string& xml_filename)
48794879
LLXMLNodePtr root;
48804880
bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
48814881

4882-
if (!success || !root || !root->hasName( "teleport_messages" ))
4882+
if (!success)
48834883
{
4884+
LLError::LLUserWarningMsg::showMissingFiles();
48844885
LL_ERRS() << "Problem reading teleport string XML file: "
4885-
<< xml_filename << LL_ENDL;
4886+
<< xml_filename << LL_ENDL;
4887+
return;
4888+
}
4889+
4890+
if (!root || !root->hasName("teleport_messages"))
4891+
{
4892+
LLError::LLUserWarningMsg::showMissingFiles();
4893+
LL_ERRS() << "Invalid teleport string XML file: "
4894+
<< xml_filename << LL_ENDL;
48864895
return;
48874896
}
48884897

0 commit comments

Comments
 (0)