From 9b364bf7037bed2c85251458b00e34088deda197 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Wed, 28 Nov 2018 16:01:36 -0800
Subject: [SL-10079] - Bom handling for animated objects

---
 indra/newview/llviewerobject.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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)
 	{
-- 
cgit v1.2.3