From b920893fa4be1b5e61e938bda79147a9c5522726 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 11 Oct 2018 20:43:56 +0100
Subject: [PATCH] removed unused member variables that make xcode 10 unhappy
---
indra/newview/llcontrolavatar.cpp | 4 ++++
indra/newview/llmeshrepository.h | 7 -------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index ed63414849b..1eeeaa42ea9 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -124,6 +124,10 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
{
LL_DEBUGS("ConstraintFix") << getFullname() << " pos fix, offset_dist " << offset_dist << " pos fixup "
<< new_pos_fixup << " was " << mPositionConstraintFixup << LL_ENDL;
+ LL_DEBUGS("ConstraintFix") << "vol_pos " << vol_pos << LL_ENDL;
+ LL_DEBUGS("ConstraintFix") << "extents " << extents[0] << " " << extents[1] << LL_ENDL;
+ LL_DEBUGS("ConstraintFix") << "unshift_extents " << unshift_extents[0] << " " << unshift_extents[1] << LL_ENDL;
+
}
}
if (box_size/mScaleConstraintFixup > max_legal_size)
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 19d4ff617e2..bba0c9f2cb1 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -535,13 +535,6 @@ class LLMeshCostData
// Estimated triangle counts derived from the LOD sizes. LOD 0=lowest, 3=highest.
std::vector<F32> mEstTrisByLOD;
-
- // Estimated triangle counts for the largest LOD. Typically this
- // is also the "high" LOD, but not necessarily.
- F32 mEstTrisMax;
-
- // Sum of all LOD sizes.
- S32 mSizeTotal;
};
class LLMeshRepository
--
GitLab