diff options
author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/newview/llinventoryobserver.cpp | |
parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r-- | indra/newview/llinventoryobserver.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 4427f32de9..26d7a7a28a 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -350,6 +350,11 @@ void LLInventoryFetchDescendentsObserver::startFetch() if (!cat) continue; if (!isCategoryComplete(cat)) { + // CHECK IT: isCategoryComplete() checks both version and descendant count but + // fetch() only works for Unknown version and doesn't care about descentants, + // as result fetch won't start and folder will potentially get stuck as + // incomplete in observer. + // Likely either both should use only version or both should check descendants. cat->fetch(); //blindly fetch it without seeing if anything else is fetching it. mIncomplete.push_back(*it); //Add to list of things being downloaded for this observer. } |