Skip to content
Snippets Groups Projects
Commit a79ac1be authored by Mnikolenko Productengine's avatar Mnikolenko Productengine
Browse files

MAINT-897 show confirmation dialog when copying notecard

parent 892d3207
No related branches found
No related tags found
No related merge requests found
...@@ -1105,10 +1105,6 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch ...@@ -1105,10 +1105,6 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch
openEmbeddedSound( item, wc ); openEmbeddedSound( item, wc );
return TRUE; return TRUE;
case LLAssetType::AT_NOTECARD:
openEmbeddedNotecard( item, wc );
return TRUE;
case LLAssetType::AT_LANDMARK: case LLAssetType::AT_LANDMARK:
openEmbeddedLandmark( item, wc ); openEmbeddedLandmark( item, wc );
return TRUE; return TRUE;
...@@ -1117,6 +1113,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch ...@@ -1117,6 +1113,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch
openEmbeddedCallingcard( item, wc ); openEmbeddedCallingcard( item, wc );
return TRUE; return TRUE;
case LLAssetType::AT_NOTECARD:
case LLAssetType::AT_LSL_TEXT: case LLAssetType::AT_LSL_TEXT:
case LLAssetType::AT_CLOTHING: case LLAssetType::AT_CLOTHING:
case LLAssetType::AT_OBJECT: case LLAssetType::AT_OBJECT:
...@@ -1182,11 +1179,6 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLPointer<LLInventoryItem> item_p ...@@ -1182,11 +1179,6 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLPointer<LLInventoryItem> item_p
} }
} }
void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc )
{
copyInventory(item, gInventoryCallbacks.registerCB(mInventoryCallback));
}
void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc ) void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc )
{ {
if(item && !item->getCreatorUUID().isNull()) if(item && !item->getCreatorUUID().isNull())
......
...@@ -105,7 +105,6 @@ class LLViewerTextEditor : public LLTextEditor ...@@ -105,7 +105,6 @@ class LLViewerTextEditor : public LLTextEditor
void openEmbeddedTexture( LLInventoryItem* item, llwchar wc ); void openEmbeddedTexture( LLInventoryItem* item, llwchar wc );
void openEmbeddedSound( LLInventoryItem* item, llwchar wc ); void openEmbeddedSound( LLInventoryItem* item, llwchar wc );
void openEmbeddedLandmark( LLPointer<LLInventoryItem> item_ptr, llwchar wc ); void openEmbeddedLandmark( LLPointer<LLInventoryItem> item_ptr, llwchar wc );
void openEmbeddedNotecard( LLInventoryItem* item, llwchar wc);
void openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc); void openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc);
void showCopyToInvDialog( LLInventoryItem* item, llwchar wc ); void showCopyToInvDialog( LLInventoryItem* item, llwchar wc );
void showUnsavedAlertDialog( LLInventoryItem* item ); void showUnsavedAlertDialog( LLInventoryItem* item );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment