diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
| commit | aa322d8eb4341c213a19cef87a887114c1ca278b (patch) | |
| tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/newview/llteleporthistorystorage.cpp | |
| parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' v 6.4.22 into DRTVWR-541
Diffstat (limited to 'indra/newview/llteleporthistorystorage.cpp')
| -rw-r--r-- | indra/newview/llteleporthistorystorage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp index 93fa457bd0..7d4988c0cc 100644 --- a/indra/newview/llteleporthistorystorage.cpp +++ b/indra/newview/llteleporthistorystorage.cpp @@ -203,6 +203,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) |