summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-19 16:24:05 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-19 16:24:05 -0700
commit8d8f167a4e58583c55901448a7bc5dd88b60e5f7 (patch)
treeb4c71519c8d9ae0fd1addece5ea1f1424ded313f /indra/newview/llinventorymodel.cpp
parent7f0a7789903809d489e9f85575be18c88df1ea98 (diff)
parentb55bce5b1b74c612f3a411889df1e0fb57bc3264 (diff)
automated merge with trunk
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)