aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreview.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:27 -0500
committerJacek Antonelli2008-08-15 23:45:27 -0500
commita8a62201ba762e98dff92cf49033e577fc34d8d4 (patch)
tree11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/llpreview.h
parentSecond Life viewer sources 1.18.6.4-RC (diff)
downloadmeta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz
Second Life viewer sources 1.19.0.0
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreview.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index d32a1b8..8a4a434 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -38,6 +38,7 @@
38#include "lluuid.h" 38#include "lluuid.h"
39#include "llviewerinventory.h" 39#include "llviewerinventory.h"
40#include "lltabcontainer.h" 40#include "lltabcontainer.h"
41#include "llinventorymodel.h"
41#include <map> 42#include <map>
42 43
43class LLLineEditor; 44class LLLineEditor;
@@ -61,7 +62,7 @@ protected:
61 static std::map<LLUUID, LLViewHandle> sAutoOpenPreviewHandles; 62 static std::map<LLUUID, LLViewHandle> sAutoOpenPreviewHandles;
62}; 63};
63 64
64class LLPreview : public LLFloater 65class LLPreview : public LLFloater, LLInventoryObserver
65{ 66{
66public: 67public:
67 typedef enum e_asset_status 68 typedef enum e_asset_status
@@ -116,6 +117,10 @@ public:
116 void setNotecardInfo(const LLUUID& notecard_inv_id, const LLUUID& object_id) 117 void setNotecardInfo(const LLUUID& notecard_inv_id, const LLUUID& object_id)
117 { mNotecardInventoryID = notecard_inv_id; mObjectID = object_id; } 118 { mNotecardInventoryID = notecard_inv_id; mObjectID = object_id; }
118 119
120 // llview
121 virtual void draw();
122 void refreshFromItem(const LLInventoryItem* item);
123
119protected: 124protected:
120 virtual void onCommit(); 125 virtual void onCommit();
121 126
@@ -124,7 +129,11 @@ protected:
124 static void onText(LLUICtrl*, void* userdata); 129 static void onText(LLUICtrl*, void* userdata);
125 static void onRadio(LLUICtrl*, void* userdata); 130 static void onRadio(LLUICtrl*, void* userdata);
126 131
127 132 // for LLInventoryObserver
133 virtual void changed(U32 mask);
134 BOOL mDirty;
135 virtual const char *getTitleName() const { return "Preview"; }
136
128protected: 137protected:
129 LLUUID mItemUUID; 138 LLUUID mItemUUID;
130 LLUUID mSourceID; 139 LLUUID mSourceID;