diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-07 13:50:30 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-07 13:50:30 -0500 |
| commit | ee159d8e742a7281f304fc45b692c111706d294e (patch) | |
| tree | 362eb9968fa778bfdd4a300b6a0b642818a973be /indra/newview/llinventorymodel.h | |
| parent | 3ddd6ad286c5cf24dbfd6b5e46fcb23f9ac25e19 (diff) | |
| parent | 83fbe4a631ed04d620b0da2fe58b92d74764183f (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index c3e04ab93c..b744d821c7 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -108,10 +108,12 @@ public: // Accessors // - // This is a convenience function to check if one object has a - // parent chain up to the category specified by UUID. + // Check if one object has a parent chain up to the category specified by UUID. BOOL isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const; + // Get whatever special folder this object is a child of, if any. + const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const; + // Get the object by id. Returns NULL if not found. // * WARNING: use the pointer returned for read operations - do // not modify the object values in place or you will break stuff. |