diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
| commit | 2662c4b679f0eb2745619dc4fd1dd79af65126f0 (patch) | |
| tree | f27ba8675353676d91327fc606b005f0096b2fb9 /indra/newview/llfloateranimpreview.cpp | |
| parent | 4b97f03b04e7df25e5b3622122f6d124d4a5f617 (diff) | |
| parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
Merge. Pulling fix for VWR-25862 into bigger cache tree.
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
| -rw-r--r-- | indra/newview/llfloateranimpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index deebd69ec1..1f334815d6 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -994,6 +994,7 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata) LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(), name, callback, expected_upload_cost, userdata); + } else { @@ -1032,7 +1033,6 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicT mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable); mDummyAvatar->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET); mDummyAvatar->hideSkirt(); - gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance()); // stop extraneous animations mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE ); |