diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 14:06:04 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-09 14:06:04 -0400 |
| commit | 3c539c498a328696c9aa3cd8f00519d9ad0a40e8 (patch) | |
| tree | 49ec2d995791cf43842fbe0764f5e5fe124a95d8 /indra/newview/llfloateranimpreview.cpp | |
| parent | ffe8417a0410a554e22210c83feadeea76d0ab8a (diff) | |
| parent | d5041f5fb0850f71474f0b6a37e15ef322c509a7 (diff) | |
reconciled .hgtags
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 ); |