aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreview.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:58 -0500
committerJacek Antonelli2008-08-15 23:44:58 -0500
commit089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch)
tree0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llpreview.h
parentSecond Life viewer sources 1.16.0.5 (diff)
downloadmeta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2
meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz
Second Life viewer sources 1.17.0.12
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreview.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index c8c0355..0369227 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -71,13 +71,13 @@ public:
71public: 71public:
72 // Used for XML-based construction. 72 // Used for XML-based construction.
73 LLPreview(const std::string& name); 73 LLPreview(const std::string& name);
74 LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize = FALSE, S32 min_width = 0, S32 min_height = 0 ); 74 LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize = FALSE, S32 min_width = 0, S32 min_height = 0, LLPointer<LLViewerInventoryItem> inv_item = NULL );
75 virtual ~LLPreview(); 75 virtual ~LLPreview();
76 76
77 void setItemID(const LLUUID& item_id); 77 void setItemID(const LLUUID& item_id);
78 void setObjectID(const LLUUID& object_id); 78 void setObjectID(const LLUUID& object_id);
79 void setSourceID(const LLUUID& source_id); 79 void setSourceID(const LLUUID& source_id);
80 LLViewerInventoryItem* getItem() const; 80 const LLViewerInventoryItem *getItem() const; // searches if not constructed with it
81 81
82 static LLPreview* find(const LLUUID& item_uuid); 82 static LLPreview* find(const LLUUID& item_uuid);
83 static LLPreview* show(const LLUUID& item_uuid, BOOL take_focus = TRUE ); 83 static LLPreview* show(const LLUUID& item_uuid, BOOL take_focus = TRUE );
@@ -154,6 +154,7 @@ protected:
154 static preview_map_t sInstances; 154 static preview_map_t sInstances;
155 LLUUID mNotecardInventoryID; 155 LLUUID mNotecardInventoryID;
156 LLUUID mObjectID; 156 LLUUID mObjectID;
157 LLPointer<LLViewerInventoryItem> mItem;
157}; 158};
158 159
159 160