1 files changed, 20 insertions, 28 deletions

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 7dce9a5..24b9929 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -73,7 +73,9 @@ const S32 PREVIEW_TEXTURE_HEIGHT = 300;
 // LLFloaterImagePreview()
 //-----------------------------------------------------------------------------
 LLFloaterImagePreview::LLFloaterImagePreview(const std::string& filename) : 
-        LLFloaterNameDesc(filename)
+        LLFloaterNameDesc(filename),
+        mAvatarPreview(NULL),
+        mSculptedPreview(NULL)
 {
         mLastMouseX = 0;
         mLastMouseY = 0;
@@ -211,13 +213,16 @@ void	LLFloaterImagePreview::onPreviewTypeCommit(LLUICtrl* ctrl, void* userdata)
 //-----------------------------------------------------------------------------
 void LLFloaterImagePreview::clearAllPreviewTextures()
 {
-        mAvatarPreview->clearPreviewTexture("mHairMesh0");
-        mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
-        mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
-        mAvatarPreview->clearPreviewTexture("mHeadMesh0");
-        mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
-        mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
-        mAvatarPreview->clearPreviewTexture("mSkirtMesh0");
+        if (mAvatarPreview)
+        {
+                mAvatarPreview->clearPreviewTexture("mHairMesh0");
+                mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
+                mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
+                mAvatarPreview->clearPreviewTexture("mHeadMesh0");
+                mAvatarPreview->clearPreviewTexture("mUpperBodyMesh0");
+                mAvatarPreview->clearPreviewTexture("mLowerBodyMesh0");
+                mAvatarPreview->clearPreviewTexture("mSkirtMesh0");
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -668,11 +673,14 @@ void LLImagePreviewAvatar::setPreviewTarget(const std::string& joint_name, const
 //-----------------------------------------------------------------------------
 void LLImagePreviewAvatar::clearPreviewTexture(const std::string& mesh_name)
 {
-        LLViewerJointMesh *mesh = (LLViewerJointMesh*)mDummyAvatar->mRoot.findJoint(mesh_name);
-        // clear out existing test mesh
-        if (mesh)
+        if (mDummyAvatar)
         {
-                mesh->setTestTexture(0);
+                LLViewerJointMesh *mesh = (LLViewerJointMesh*)mDummyAvatar->mRoot.findJoint(mesh_name);
+                // clear out existing test mesh
+                if (mesh)
+                {
+                        mesh->setTestTexture(0);
+                }
         }
 }
 
@@ -793,27 +801,11 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
         
         F32 const HIGHEST_LOD = 4.0f;
         mVolume = new LLVolume(volume_params,  HIGHEST_LOD);
-
-        /*
-        mDummyAvatar = new LLVOAvatar(LLUUID::null, LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
-        mDummyAvatar->createDrawable(&gPipeline);
-        mDummyAvatar->mIsDummy = TRUE;
-        mDummyAvatar->mSpecialRenderMode = 2;
-        mDummyAvatar->setPositionAgent(LLVector3::zero);
-        mDummyAvatar->slamPosition();
-        mDummyAvatar->updateJointLODs();
-        mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
-        mTextureName = 0;
-        */
 }
 
 
 LLImagePreviewSculpted::~LLImagePreviewSculpted()
 {
-        /*
-        mDummyAvatar->markDead();
-        */
 }