From bffe4b185db2b0eb38d6f5503a7f6c85280259b3 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 18 Mar 2010 15:26:17 -0400 Subject: EXT-5851 EXT-5422 crash on texture upload Uploading texture caused the dummy avatar preview to initialize its joints twice removing extra call to initInstance removed the crash in LLJoint. Verified repro no longer crashes viewer. Code reviewed by Vir. --- indra/newview/llfloaterimagepreview.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 9917593c91..6b754bd065 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -611,7 +611,6 @@ LLImagePreviewAvatar::LLImagePreviewAvatar(S32 width, S32 height) : LLViewerDyna mCameraZoom = 1.f; mDummyAvatar = (LLVOAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion()); - mDummyAvatar->initInstance(); mDummyAvatar->createDrawable(&gPipeline); mDummyAvatar->mIsDummy = TRUE; mDummyAvatar->mSpecialRenderMode = 2; -- cgit v1.2.3