diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
| commit | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch) | |
| tree | 7695bb632502f24325f7044c69e30946e767abce /indra/newview/llinventorymodel.h | |
| parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) | |
| parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) | |
merge changes for vmrg-217
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 3 |
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 |