diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llviewertexteditor.h | 1 | 
2 files changed, 1 insertions, 10 deletions
| diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 09cdfe1309..7323a5b2f3 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -1105,10 +1105,6 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch  			openEmbeddedSound( item, wc );  			return TRUE; -		case LLAssetType::AT_NOTECARD: -			openEmbeddedNotecard( item, wc ); -			return TRUE; -  		case LLAssetType::AT_LANDMARK:  			openEmbeddedLandmark( item, wc );  			return TRUE; @@ -1117,6 +1113,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch  			openEmbeddedCallingcard( item, wc );  			return TRUE; +		case LLAssetType::AT_NOTECARD:  		case LLAssetType::AT_LSL_TEXT:  		case LLAssetType::AT_CLOTHING:  		case LLAssetType::AT_OBJECT: @@ -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 )  {  	if(item && !item->getCreatorUUID().isNull()) 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 ); | 
