summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-05-12 15:43:56 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-05-12 15:43:56 +0300
commit3afa084e220c0e745a90734b0ea2f68730b746bc (patch)
treea29585f942c9365feed9548c145ff5716ab84514 /indra/newview/llinventorymodel.cpp
parentfbaae0a2df3b68756c7d910438041887d018cd63 (diff)
parent1cee577ca0234eee7da243c85be8eb7524d691c7 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 6452ae82f8..e63da1ebb9 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1329,7 +1329,6 @@ bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id)
return cat->fetch();
}
-
void LLInventoryModel::cache(
const LLUUID& parent_folder_id,
const LLUUID& agent_id)