summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-19 10:04:23 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-19 10:04:23 +0100
commit02fe5d60c0a6664bb86254347ce31467da2d90c3 (patch)
treefe1420806e453a14a63b4f16ad2d566a8c9a0d1a /indra/newview/llinventorymodel.h
parentcd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (diff)
parentb550bb0f09197c35b80d18d540761a7831c3e89b (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r--indra/newview/llinventorymodel.h2
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