1 files changed, 17 insertions, 8 deletions

diff --git a/linden/indra/newview/llpreviewanim.cpp b/linden/indra/newview/llpreviewanim.cpp
index bd619b4..ae98fb0 100644
--- a/linden/indra/newview/llpreviewanim.cpp
+++ b/linden/indra/newview/llpreviewanim.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -92,11 +93,14 @@ LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const
 // static
 void LLPreviewAnim::endAnimCallback( void *userdata )
 {
-        LLPreviewAnim* self = (LLPreviewAnim*) userdata;
-
-        self->childSetValue("Anim play btn", FALSE);
-        self->childSetValue("Anim audition btn", FALSE);
-
+        LLViewHandle* handlep = ((LLViewHandle*)userdata);
+        LLFloater* self = getFloaterByHandle(*handlep);
+        delete handlep; // done with the handle
+        if (self)
+        {
+                self->childSetValue("Anim play btn", FALSE);
+                self->childSetValue("Anim audition btn", FALSE);
+        }
 }
 
 // static
@@ -124,7 +128,9 @@ void LLPreviewAnim::playAnim( void *userdata )
                         LLMotion*   motion = avatar->findMotion(itemID);
                         
                         if (motion)
-                                motion->setDeactivateCallback(&endAnimCallback, (void *)self);
+                        {
+                                motion->setDeactivateCallback(&endAnimCallback, (void *)(new LLViewHandle(self->getHandle())));
+                        }
                 }
                 else
                 {
@@ -159,7 +165,9 @@ void LLPreviewAnim::auditionAnim( void *userdata )
                         LLMotion*   motion = avatar->findMotion(itemID);
                         
                         if (motion)
-                                motion->setDeactivateCallback(&endAnimCallback, (void *)self);
+                        {
+                                motion->setDeactivateCallback(&endAnimCallback, (void *)(new LLViewHandle(self->getHandle())));
+                        }
                 }
                 else
                 {
@@ -209,8 +217,9 @@ void LLPreviewAnim::onClose(bool app_quitting)
                 LLMotion*   motion = avatar->findMotion(item->getAssetUUID());
                 
                 if (motion)
+                {
                         motion->setDeactivateCallback(NULL, (void *)NULL);
-
+                }
         }
         destroy();
 }