summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-03-18 15:47:13 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-03-18 15:47:13 -0400
commitae371d0411693b970ef5663ac53bbe87285b2f4b (patch)
tree35ecf2154b8087853b06d4681efd95f5d3cb1e92 /indra
parenta04cdf5af27965d560dade1778fd3fbeaf88a912 (diff)
parentc5a6360943c19b27fdca50921e3a82fdf839ecd5 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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;