summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryobserver.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-08-16 15:43:58 -0400
committerOz Linden <oz@lindenlab.com>2017-08-16 15:43:58 -0400
commit01e0b78c595e346bef4e771f9580006dd895367c (patch)
tree90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/newview/llinventoryobserver.cpp
parent2368c44a8e2b031e5a8ac199923a016915cfe96a (diff)
parentcf865bb5962a85e2da3414468d6a99ecb5423f97 (diff)
merge changes for DRTVWR-439
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r--indra/newview/llinventoryobserver.cpp5
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.
}