summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index bb853a3ddc..716333b217 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -424,11 +424,11 @@ void LLControlAvatar::updateDebugText()
S32 total_linkset_count = 0;
if (mRootVolp)
{
- total_linkset_count = 1 + mRootVolp->getChildren().size();
+ total_linkset_count = 1 + static_cast<S32>(mRootVolp->getChildren().size());
}
std::vector<LLVOVolume*> volumes;
getAnimatedVolumes(volumes);
- S32 animated_volume_count = volumes.size();
+ S32 animated_volume_count = static_cast<S32>(volumes.size());
std::string active_string;
std::string type_string;
std::string lod_string;