Merge branch 'master' into DRTVWR-528

1 files changed, 13 insertions, 6 deletions

diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h
index 8eaed6ca1f..9f4ad4fa69 100644
--- a/indra/newview/llpreviewanim.h
+++ b/indra/newview/llpreviewanim.h
@@ -30,21 +30,28 @@
 #include "llpreview.h"
 #include "llcharacter.h"
 
+class LLMotion;
+class LLTextBox;
+
 class LLPreviewAnim : public LLPreview
 {
 public:
 
 	LLPreviewAnim(const LLSD& key);
-	/*virtual*/	BOOL postBuild();
-	/*virtual*/ void onClose(bool app_quitting);
-	void draw();
-	void cleanup();
+	BOOL postBuild() override;
+	void onClose(bool app_quitting) override;
+	void draw() override;
+	void refreshFromItem() override;
+
+	void cleanup(); // cleanup 'playing' state
 	void play(const LLSD& param);
-	
+	void showAdvanced();
+
 protected:
 	
-	LLUUID	mItemID;
+	LLUUID	mItemID; // Not an item id, but a playing asset id
 	bool	mDidStart;
+	LLTextBox* pAdvancedStatsTextBox;
 };
 
 #endif  // LL_LLPREVIEWANIM_H