Merge of my DEV-36732 work and all the main line login api work that went on.

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 6857d14fff..6fe23e8aeb 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -36,7 +36,7 @@
 #include "llbutton.h"
 #include "llresmgr.h"
 #include "llinventory.h"
-#include "llinventoryview.h"
+#include "llfloaterinventory.h"
 #include "llvoavatarself.h"
 #include "llagent.h"          // gAgent
 #include "llkeyframemotion.h"
@@ -69,6 +69,8 @@ void LLPreviewAnim::endAnimCallback( void *userdata )
 // virtual
 BOOL LLPreviewAnim::postBuild()
 {
+	mCloseSignal.connect(boost::bind(&LLPreviewAnim::onClose, this));
+	
 	const LLInventoryItem* item = getItem();
 	if(item)
 	{
@@ -180,7 +182,7 @@ void LLPreviewAnim::auditionAnim( void *userdata )
 	}
 }
 
-void LLPreviewAnim::onClose(bool app_quitting)
+void LLPreviewAnim::onClose()
 {
 	const LLInventoryItem *item = getItem();
 
@@ -198,5 +200,4 @@ void LLPreviewAnim::onClose(bool app_quitting)
 			motion->setDeactivateCallback(NULL, (void *)NULL);
 		}
 	}
-	destroy();
 }