diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llpreview.h | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to 'linden/indra/newview/llpreview.h')
| -rw-r--r-- | linden/indra/newview/llpreview.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h index ff084be..fba4ef2 100644 --- a/linden/indra/newview/llpreview.h +++ b/linden/indra/newview/llpreview.h | |||
| @@ -84,6 +84,7 @@ public: | |||
| 84 | void setItemID(const LLUUID& item_id); | 84 | void setItemID(const LLUUID& item_id); |
| 85 | void setObjectID(const LLUUID& object_id); | 85 | void setObjectID(const LLUUID& object_id); |
| 86 | void setSourceID(const LLUUID& source_id); | 86 | void setSourceID(const LLUUID& source_id); |
| 87 | void setAssetId(const LLUUID& asset_id); | ||
| 87 | const LLViewerInventoryItem *getItem() const; // searches if not constructed with it | 88 | const LLViewerInventoryItem *getItem() const; // searches if not constructed with it |
| 88 | 89 | ||
| 89 | static LLPreview* find(const LLUUID& item_uuid); | 90 | static LLPreview* find(const LLUUID& item_uuid); |