svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 99e971b33c..de57b68e7d 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -67,7 +67,14 @@ public:
 		// If this starts a line, you need to prepend a newline.
 
 	void copyInventory(LLInventoryItem* item);
-	
+
+	// returns true if there is embedded inventory.
+	// *HACK: This is only useful because the notecard verifier may
+	// change the asset if there is embedded inventory. This mechanism
+	// should be changed to get a different asset id from the verifier
+	// rather than checking if a re-load is necessary. Phoenix 2007-02-27
+	bool hasEmbeddedInventory();
+
 protected:
 	// Embedded object operations
 	virtual llwchar	pasteEmbeddedItem(llwchar ext_char);