From f9ed4fedab7c7deab20aeddd88ab40f3958af5a3 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 7 Sep 2020 12:14:27 +0300 Subject: SL-13878 FIXED The no title location appears in 'Teleport history' after adding a blank line to teleport_history.txt --- indra/newview/llteleporthistorystorage.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp index 8a5704939a..658ab453d2 100644 --- a/indra/newview/llteleporthistorystorage.cpp +++ b/indra/newview/llteleporthistorystorage.cpp @@ -201,6 +201,12 @@ void LLTeleportHistoryStorage::load() std::string line; while (std::getline(file, line)) { + if (line.empty()) + { + LL_WARNS() << "Teleport history contains empty line."<< LL_ENDL; + continue; + } + LLSD s_item; std::istringstream iss(line); if (parser->parse(iss, s_item, line.length()) == LLSDParser::PARSE_FAILURE) -- cgit v1.2.3