From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 indra/newview/llpreviewanim.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llpreviewanim.h')

diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h
index ca42b7e731..d24e624c32 100644
--- a/indra/newview/llpreviewanim.h
+++ b/indra/newview/llpreviewanim.h
@@ -49,7 +49,7 @@ public:
 	void activate(e_activation_type type);
 	
 protected:
-	virtual void onClose(bool app_quitting);
+	void onClose();
 	
 	LLAnimPauseRequest	mPauseRequest;
 	LLUUID		mItemID;
-- 
cgit v1.2.3