summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-10-28 09:33:57 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-10-28 09:33:57 -0400
commit5dcd81c15507ad8f487e5727bc7a94de82f6fb45 (patch)
treeb1df07956c4883bbf336c36e9701a1e0f2eb2f00 /indra/newview
parentdd2caad496b6a1fd34f987044f25223311ca3d46 (diff)
SL-451 - avoid more high-cost string operations in a per-frame function
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llskinningutil.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index c0589e33bb..b2fd1744bc 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -53,6 +53,10 @@ U32 LLSkinningUtil::getMeshJointCount(const LLMeshSkinInfo *skin)
// static
void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin)
{
+ if (skin->mInvalidJointsScrubbed)
+ {
+ return;
+ }
for (U32 j = 0; j < skin->mJointNames.size(); ++j)
{
// Fix invalid names to "mPelvis". Currently meshes with
@@ -63,6 +67,7 @@ void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin
skin->mJointNames[j] = "mPelvis";
}
}
+ skin->mInvalidJointsScrubbed = true;
}
// static