diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-18 15:26:31 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-18 15:26:31 -0400 |
| commit | c5a6360943c19b27fdca50921e3a82fdf839ecd5 (patch) | |
| tree | 5ce6a5a503ee25f35285f486ca89ba21957d762b | |
| parent | 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 (diff) | |
| parent | bffe4b185db2b0eb38d6f5503a7f6c85280259b3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llfloaterimagepreview.cpp | 1 |
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; |