1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6c7e815b04..6bd86f7902 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -659,7 +659,6 @@ bool LLViewerInventoryCategory::fetch()
 		mDescendentsRequested.reset();
 		mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
 
-
 		std::string url;
 		if (gAgent.getRegion())
 		{
@@ -678,6 +677,24 @@ bool LLViewerInventoryCategory::fetch()
 	return false;
 }
 
+void LLViewerInventoryCategory::setFetching(bool fetching)
+{
+    if (fetching)
+    {
+        if ((VERSION_UNKNOWN == getVersion())
+            && mDescendentsRequested.hasExpired())
+        {
+            const F32 FETCH_TIMER_EXPIRY = 10.0f;
+            mDescendentsRequested.reset();
+            mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+        }
+    }
+    else
+    {
+        mDescendentsRequested.stop();
+    }
+}
+
 S32 LLViewerInventoryCategory::getViewerDescendentCount() const
 {
 	LLInventoryModel::cat_array_t* cats;