diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llpreview.h | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llpreview.h')
-rw-r--r-- | linden/indra/newview/llpreview.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h index 418c797..7882b4c 100644 --- a/linden/indra/newview/llpreview.h +++ b/linden/indra/newview/llpreview.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "lluuid.h" | 34 | #include "lluuid.h" |
35 | #include "llviewerinventory.h" | 35 | #include "llviewerinventory.h" |
36 | #include "lltabcontainer.h" | 36 | #include "lltabcontainer.h" |
37 | #include "lllineeditor.h" | 37 | #include <map> |
38 | 38 | ||
39 | class LLLineEditor; | 39 | class LLLineEditor; |
40 | class LLRadioGroup; | 40 | class LLRadioGroup; |
@@ -45,8 +45,15 @@ class LLMultiPreview : public LLMultiFloater | |||
45 | public: | 45 | public: |
46 | LLMultiPreview(const LLRect& rect); | 46 | LLMultiPreview(const LLRect& rect); |
47 | 47 | ||
48 | /*virtual*/void open(); | 48 | /*virtual*/void open(); /*Flawfinder: ignore*/ |
49 | /*virtual*/void tabOpen(LLFloater* opened_floater, bool from_click); | 49 | /*virtual*/void tabOpen(LLFloater* opened_floater, bool from_click); |
50 | |||
51 | static LLMultiPreview* getAutoOpenInstance(const LLUUID& id); | ||
52 | static void setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id); | ||
53 | |||
54 | protected: | ||
55 | typedef std::map<LLUUID, LLViewHandle> handle_map_t; | ||
56 | static std::map<LLUUID, LLViewHandle> sAutoOpenPreviewHandles; | ||
50 | }; | 57 | }; |
51 | 58 | ||
52 | class LLPreview : public LLFloater | 59 | class LLPreview : public LLFloater |
@@ -79,7 +86,7 @@ public: | |||
79 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 86 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
80 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 87 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
81 | virtual BOOL handleHover(S32 x, S32 y, MASK mask); | 88 | virtual BOOL handleHover(S32 x, S32 y, MASK mask); |
82 | virtual void open(); | 89 | virtual void open(); /*Flawfinder: ignore*/ |
83 | virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr); | 90 | virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr); |
84 | 91 | ||
85 | void setAuxItem( const LLInventoryItem* item ) | 92 | void setAuxItem( const LLInventoryItem* item ) |