diff options
author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llviewertexteditor.h | |
parent | Second Life viewer sources 1.18.2.1 (diff) | |
download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewertexteditor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h index 1dbc7b6..230ce3e 100644 --- a/linden/indra/newview/llviewertexteditor.h +++ b/linden/indra/newview/llviewertexteditor.h | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | class LLInventoryItem; | 34 | class LLInventoryItem; |
35 | class LLEmbeddedItems; | 35 | class LLEmbeddedItems; |
36 | 36 | class LLEmbeddedNotecardOpener; | |
37 | 37 | ||
38 | // | 38 | // |
39 | // Classes | 39 | // Classes |
@@ -86,7 +86,7 @@ public: | |||
86 | // Appends Second Life time, small font, grey | 86 | // Appends Second Life time, small font, grey |
87 | // If this starts a line, you need to prepend a newline. | 87 | // If this starts a line, you need to prepend a newline. |
88 | 88 | ||
89 | void copyInventory(LLInventoryItem* item); | 89 | void copyInventory(const LLInventoryItem* item, U32 callback_id = 0); |
90 | 90 | ||
91 | // returns true if there is embedded inventory. | 91 | // returns true if there is embedded inventory. |
92 | // *HACK: This is only useful because the notecard verifier may | 92 | // *HACK: This is only useful because the notecard verifier may |
@@ -123,6 +123,8 @@ protected: | |||
123 | 123 | ||
124 | LLUUID mObjectID; | 124 | LLUUID mObjectID; |
125 | LLUUID mNotecardInventoryID; | 125 | LLUUID mNotecardInventoryID; |
126 | |||
127 | LLPointer<LLEmbeddedNotecardOpener> mInventoryCallback; | ||
126 | }; | 128 | }; |
127 | 129 | ||
128 | #endif // LL_VIEWERTEXTEDITOR_H | 130 | #endif // LL_VIEWERTEXTEDITOR_H |