diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llviewertexteditor.h | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
| -rw-r--r-- | indra/newview/llviewertexteditor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index a57b3fec7e..58ca74156a 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -13,7 +13,7 @@ class LLInventoryItem; class LLEmbeddedItems; - +class LLEmbeddedNotecardOpener; // // Classes @@ -66,7 +66,7 @@ public: // Appends Second Life time, small font, grey // If this starts a line, you need to prepend a newline. - void copyInventory(LLInventoryItem* item); + void copyInventory(const LLInventoryItem* item, U32 callback_id = 0); // returns true if there is embedded inventory. // *HACK: This is only useful because the notecard verifier may @@ -103,6 +103,8 @@ protected: LLUUID mObjectID; LLUUID mNotecardInventoryID; + + LLPointer<LLEmbeddedNotecardOpener> mInventoryCallback; }; #endif // LL_VIEWERTEXTEDITOR_H |