summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexteditor.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
-rw-r--r--indra/newview/llviewertexteditor.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 74b6d70640..ba0c40cb2e 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -104,16 +104,13 @@ private:
virtual llwchar pasteEmbeddedItem(llwchar ext_char);
BOOL openEmbeddedItemAtPos( S32 pos );
- BOOL openEmbeddedItem(LLPointer<LLInventoryItem> item, llwchar wc);
+ BOOL openEmbeddedItem(LLInventoryItem* item, llwchar wc);
S32 insertEmbeddedItem(S32 pos, LLInventoryItem* item);
- // *NOTE: most of openEmbeddedXXX methods except openEmbeddedLandmark take pointer to LLInventoryItem.
- // Be sure they don't bind it to callback function to avoid situation when it gets invalid when
- // callback is trigged after text editor is closed. See EXT-8459.
void openEmbeddedTexture( LLInventoryItem* item, llwchar wc );
void openEmbeddedSound( LLInventoryItem* item, llwchar wc );
- void openEmbeddedLandmark( LLPointer<LLInventoryItem> item_ptr, llwchar wc );
+ void openEmbeddedLandmark( LLInventoryItem* item, llwchar wc );
void openEmbeddedNotecard( LLInventoryItem* item, llwchar wc);
void openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc);
void showCopyToInvDialog( LLInventoryItem* item, llwchar wc );