summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-05 10:52:04 -0600
committerDave Parks <davep@lindenlab.com>2010-03-05 10:52:04 -0600
commit3799b1bcf325f1519b9dc07c2a0774b8e579bd19 (patch)
treed7683e6adf57a6234b5160e6b46ff9b4c8db59ae /indra/newview/llface.cpp
parentb27ce5bc88af7195f18b1d8752056d80620be702 (diff)
parent988520f3a7d5d5e817326945d8b9c3808c4eb5f7 (diff)
merge
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 770811b587..53330e4d98 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -883,12 +883,14 @@ void LLFace::updateRebuildFlags()
}
}
+static LLFastTimer::DeclareTimer FTM_FACE_GET_GEOM("Face Geom");
+
BOOL LLFace::getGeometryVolume(const LLVolume& volume,
const S32 &f,
const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
const U16 &index_offset)
{
- llpushcallstacks ;
+ LLFastTimer t(FTM_FACE_GET_GEOM);
const LLVolumeFace &vf = volume.getVolumeFace(f);
S32 num_vertices = (S32)vf.mVertices.size();
S32 num_indices = LLPipeline::sUseTriStrips ? (S32)vf.mTriStrip.size() : (S32) vf.mIndices.size();