From dd2caad496b6a1fd34f987044f25223311ca3d46 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 27 Oct 2016 10:30:58 -0400
Subject: [PATCH] SL-503 - fix for mac build whinging
---
indra/newview/llvoavatar.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ec903211396..fb1bbb21377 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8557,7 +8557,7 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
pJoint->getAllAttachmentPosOverrides(num_pos_overrides, distinct_pos_overrides);
apr_file_printf( file, "\t\t<joint_offset name=\"%s\" position=\"%f %f %f\" mesh_id=\"%s\" count=\"%d\" distinct=\"%d\"/>\n",
pJoint->getName().c_str(), pos[0], pos[1], pos[2], mesh_id.asString().c_str(),
- num_pos_overrides, distinct_pos_overrides.size());
+ num_pos_overrides, (S32) distinct_pos_overrides.size());
}
}
// Joint scale overrides
@@ -8576,7 +8576,7 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
pJoint->getAllAttachmentPosOverrides(num_scale_overrides, distinct_scale_overrides);
apr_file_printf( file, "\t\t<joint_scale name=\"%s\" scale=\"%f %f %f\" mesh_id=\"%s\" count=\"%d\" distinct=\"%d\"/>\n",
pJoint->getName().c_str(), scale[0], scale[1], scale[2], mesh_id.asString().c_str(),
- num_scale_overrides, distinct_scale_overrides.size());
+ num_scale_overrides, (S32) distinct_scale_overrides.size());
}
}
F32 pelvis_fixup;
--
GitLab