diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-11-15 10:32:18 -0600 |
| commit | 361efcb9267f2c91f88198081bbe6ac2264766fd (patch) | |
| tree | 1b91985a7aa1bd48137fd493d6ce9444a7afb21b /indra/newview/llinventorymodel.cpp | |
| parent | 0edb7cad6bdeaf02cbd89d1f2dd38c47d6078c03 (diff) | |
| parent | 843866d193a0fb5ea882408c8862335ab9c5539b (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -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 ca13b9eb03..05aa2e423f 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3346,7 +3346,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)) @@ -3412,12 +3412,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(); |