diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-25 15:58:08 +0100 |
commit | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (patch) | |
tree | 70eb3619b9a3df35687836d9daa328eb52ba85ab /indra/newview/llviewerjoint.cpp | |
parent | 6fcde580c3a2e6cc62bfab52bd47cae8726c56d4 (diff) | |
parent | e416840f85dc4a367894036b9fe483f17d959c54 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerjoint.cpp')
-rw-r--r-- | indra/newview/llviewerjoint.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index dada3ee3b9..0cf5fe0ada 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -434,13 +434,13 @@ void LLViewerJoint::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pix } } -void LLViewerJoint::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind) +void LLViewerJoint::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind, bool terse_update) { for (child_list_t::iterator iter = mChildren.begin(); iter != mChildren.end(); ++iter) { LLViewerJoint* joint = (LLViewerJoint*)(*iter); - joint->updateFaceData(face, pixel_area, damp_wind); + joint->updateFaceData(face, pixel_area, damp_wind, terse_update); } } |