diff options
| author | Anchor <none@none> | 2018-11-28 16:01:36 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2018-11-28 16:01:36 -0800 |
| commit | 9b364bf7037bed2c85251458b00e34088deda197 (patch) | |
| tree | f2910d485afd4060842f2f7e52eee13b0d073aad /indra/newview/llviewerobject.cpp | |
| parent | 014480a79b765587881d0c0f707a7ee191f5fe2e (diff) | |
[SL-10079] - Bom handling for animated objects
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index e9b0316393..1539f47ca7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -1,4 +1,4 @@ -/** +is_a/** * @file llviewerobject.cpp * @brief Base class for viewer objects * @@ -4682,6 +4682,12 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id) return NULL; } + LLViewerObject *root = getRootEdit(); + if (root && root->isAnimatedObject()) + { + return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + } + LLVOAvatar* avatar = getAvatar(); if (avatar) { |