summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-03-18 15:26:17 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-03-18 15:26:17 -0400
commitbffe4b185db2b0eb38d6f5503a7f6c85280259b3 (patch)
treec2bc76a77b884dc6c188d2f925658781de074cec /indra
parent3fa23202b3368ed162106b06c0c60397f63417bb (diff)
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.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterimagepreview.cpp1
1 files changed, 0 insertions, 1 deletions
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;