diff options
author | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
---|---|---|
committer | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
commit | de78d17e912b7e2a4c563a7a428f11cce33644c0 (patch) | |
tree | 6c415389f180f6a5d879b050670fd6cd3d987229 /indra/newview/llfloateranimpreview.cpp | |
parent | 888b39c283e53fd128778e70e231bcb6053de4b8 (diff) | |
parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) |
Merge from viewer-experience
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 ); |