summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewanim.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-10-11 14:16:39 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-10-11 14:16:39 +0100
commit299592e88e90d0942ba29e1edfa8b72691489e00 (patch)
tree7f14e8fce6e7824982233978833b8fe00384912c /indra/newview/llpreviewanim.cpp
parentaae13d1966b74adf59e1510bade8652f33e6867e (diff)
parentb6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff)
merge
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
-rw-r--r--indra/newview/llpreviewanim.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index fb40af1302..12ac9e6fc5 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -148,6 +148,12 @@ void LLPreviewAnim::draw()
}
if(gAgentAvatarp->isMotionActive(this->mItemID) && !this->mDidStart)
{
+ const LLInventoryItem *item = getItem();
+ LLMotion* motion = gAgentAvatarp->findMotion(this->mItemID);
+ if (item && motion)
+ {
+ motion->setName(item->getName());
+ }
this->mDidStart = true;
}
}