summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-07 18:39:29 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-07 18:39:29 +0300
commitbb2a0adecaee2f7464caff602473d75c6b65bcaa (patch)
tree6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/newview/llinventorymodel.cpp
parent7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff)
parentadce2ecdf8f3a0efcd4907699d286012124ac496 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b6202c6a8c..6452ae82f8 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1326,9 +1326,10 @@ bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
//{
// known_descendents += items->count();
//}
- return cat->fetchDescendents();
+ return cat->fetch();
}
+
void LLInventoryModel::cache(
const LLUUID& parent_folder_id,
const LLUUID& agent_id)