diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
commit | ac17ec0c287246dbb00d21a6b4994949eac69737 (patch) | |
tree | 3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/llinventorymodel.h | |
parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) |
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r-- | indra/newview/llinventorymodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 5f5d4d6118..1f7bd50328 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -256,7 +256,7 @@ public: // updateCategory() method to actually modify values. LLViewerInventoryCategory* getCategory(const LLUUID& id) const; - // Get the inventoryID that this item points to, else just return item_id. + // Get the inventoryID or item that this item points to, else just return object_id const LLUUID& getLinkedItemID(const LLUUID& object_id) const; private: mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups |