summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-07 13:20:33 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-07 13:20:33 -0700
commit8ba5517a0827af423e95526043c6cf52b211e73f (patch)
treeefc9472256e98c97c7af9728080c2f92707219dc /indra/newview/llinventorymodel.cpp
parent8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff)
parent658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 (diff)
Automated merge
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)