diff options
author | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-03-06 14:31:51 -0500 |
commit | 61bddc22d97150cd590bc4184355133b6dd3ff87 (patch) | |
tree | 59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/llviewertexteditor.h | |
parent | a18d4df6c742aa397b70e4dafb41475bd201a558 (diff) | |
parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) |
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
-rw-r--r-- | indra/newview/llviewertexteditor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index 477119d4f2..33cfca4f90 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -105,7 +105,6 @@ private: void openEmbeddedTexture( LLInventoryItem* item, llwchar wc ); void openEmbeddedSound( LLInventoryItem* item, llwchar wc ); void openEmbeddedLandmark( LLPointer<LLInventoryItem> item_ptr, llwchar wc ); - void openEmbeddedNotecard( LLInventoryItem* item, llwchar wc); void openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc); void showCopyToInvDialog( LLInventoryItem* item, llwchar wc ); void showUnsavedAlertDialog( LLInventoryItem* item ); |