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, 0 deletions

diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index 3bb3da5f54..730c56833a 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -50,6 +50,14 @@ public:
 	const LLInventoryItem* getDragItem();
 
 
+	// return true if there is any embedded inventory.
+	bool hasEmbeddedInventory();
+
+	// After saving a notecard, the tcp based upload system will
+	// change the asset, therefore, we need to re-fetch it from the
+	// asset system. :(
+	void refreshFromInventory();
+
 protected:
 
 	virtual void loadAsset();