Merge branch 'master' into DRTVWR-544-maint

# Conflicts:
#	indra/newview/llvoicevivox.cpp

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index d9c14815c1..3a706b8645 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -31,6 +31,7 @@
 #include "llassetstorage.h"
 #include "llpreviewscript.h"
 #include "lliconctrl.h"
+#include "llvoinventorylistener.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPreviewNotecard
@@ -41,7 +42,7 @@
 class LLViewerTextEditor;
 class LLButton;
 
-class LLPreviewNotecard : public LLPreview
+class LLPreviewNotecard : public LLPreview, public LLVOInventoryListener
 {
 public:
 	LLPreviewNotecard(const LLSD& key);
@@ -75,6 +76,11 @@ public:
 
 	void syncExternal();
 
+    void inventoryChanged(LLViewerObject* object,
+        LLInventoryObject::object_list_t* inventory,
+        S32 serial_num,
+        void* user_data) override;
+
 protected:
 
 	void updateTitleButtons() override;