summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-02-24 16:12:43 +0100
committerKitty Barnett <develop@catznip.com>2012-02-24 16:12:43 +0100
commite0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch)
tree44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/newview/llinventorymodel.h
parente615660823e680e824d2db0f1a59917597e64a13 (diff)
parent289d756ea86bd3898f41592146d8f549cd056846 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r--indra/newview/llinventorymodel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 19d1e4e01f..7cd85c4ab7 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -239,6 +239,9 @@ public:
// Get whatever special folder this object is a child of, if any.
const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const;
+
+ // Get first descendant of the child object under the specified parent
+ const LLViewerInventoryCategory *getFirstDescendantOf(const LLUUID& master_parent_id, const LLUUID& obj_id) const;
// Get the object by id. Returns NULL if not found.
// NOTE: Use the pointer returned for read operations - do