diff options
| author | Jacek Antonelli | 2009-10-26 13:56:50 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-26 13:56:50 -0500 |
| commit | 5f65f970b3e6321bf20d2570a0ff234dac88d99b (patch) | |
| tree | 3a77883e6f3c767dc942abcf9ee579b815e31ed7 /linden/indra/newview/llpreview.h | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| parent | Added Advanced menu option for AllowMultipleViewers for testing purposes (diff) | |
| download | meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.zip meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.gz meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.bz2 meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.xz | |
Merge remote branch 'mccabe/next' into next
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 74daca6..4e159f3 100644 --- a/linden/indra/newview/llpreview.h +++ b/linden/indra/newview/llpreview.h | |||
| @@ -83,6 +83,7 @@ public: | |||
| 83 | void setItemID(const LLUUID& item_id); | 83 | void setItemID(const LLUUID& item_id); |
| 84 | void setObjectID(const LLUUID& object_id); | 84 | void setObjectID(const LLUUID& object_id); |
| 85 | void setSourceID(const LLUUID& source_id); | 85 | void setSourceID(const LLUUID& source_id); |
| 86 | void setAssetId(const LLUUID& asset_id); | ||
| 86 | const LLViewerInventoryItem *getItem() const; // searches if not constructed with it | 87 | const LLViewerInventoryItem *getItem() const; // searches if not constructed with it |
| 87 | 88 | ||
| 88 | static LLPreview* find(const LLUUID& item_uuid); | 89 | static LLPreview* find(const LLUUID& item_uuid); |