diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
tree | 214b852c8451409d5d355437ddad48199bef976a /indra/newview/llface.h | |
parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) |
Merge with viewer-bear
Diffstat (limited to 'indra/newview/llface.h')
-rwxr-xr-x | indra/newview/llface.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 66b5f13740..c9037ce1eb 100755 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -194,7 +194,8 @@ public: void setSize(S32 numVertices, S32 num_indices = 0, bool align = false); - BOOL genVolumeBBoxes(const LLVolume &volume, S32 f,const LLMatrix4& mat, BOOL global_volume = FALSE); + BOOL genVolumeBBoxes(const LLVolume &volume, S32 f, + const LLMatrix4& mat_vert_in, BOOL global_volume = FALSE); void init(LLDrawable* drawablep, LLViewerObject* objp); void destroy(); |