summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-11 15:46:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-11 15:46:48 -0400
commit37dc96ccdde6263188ffc4f620492a4bb2017761 (patch)
treea30a05b08a64d3e2e83d50f1488aac902d542501 /indra/newview/llinventorymodel.cpp
parent4c03806be99d4cb0df55b345f4c758f39d7f8560 (diff)
parent215ae1ed5d79f44549ade91f7e84134ab4589447 (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)