diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-11-03 13:09:54 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-11-06 14:30:33 -0800 |
| commit | afa45530f745af8c9d595948ac957b12664cca2c (patch) | |
| tree | 4a3a527970d643bdb9c3ced06284d9aca53c6e78 /indra/newview | |
| parent | cc089d88ad5ab9088a5036e1d6f301d87cb3b127 (diff) | |
SL-19968 disabled pump_idle_network for now due to it causing several failures during login
also added suggested continue statements, and removed obsolete
LLInventoryItem::fromLLSD deserialization codepath.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 74a5442586..8583cca103 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3342,7 +3342,7 @@ bool LLInventoryModel::loadFromFile(const std::string& filename, is_cache_obsolete = true; // Obsolete until proven current - U64 lines_count = 0U; + //U64 lines_count = 0U; std::string line; LLPointer<LLSDParser> parser = new LLSDNotationParser(); while (std::getline(file, line)) @@ -3408,12 +3408,13 @@ bool LLInventoryModel::loadFromFile(const std::string& filename, } } - static constexpr U64 BATCH_SIZE = 512U; - if ((++lines_count % BATCH_SIZE) == 0) - { - // SL-19968 - make sure message system code gets a chance to run every so often - pump_idle_startup_network(); - } +// TODO(brad) - figure out how to reenable this without breaking everything else +// static constexpr U64 BATCH_SIZE = 512U; +// if ((++lines_count % BATCH_SIZE) == 0) +// { +// // SL-19968 - make sure message system code gets a chance to run every so often +// pump_idle_startup_network(); +// } } file.close(); |