diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-12 09:59:50 -0800 |
| commit | 4745ab85dab9e418c49e5c4a722aa88548b8f39e (patch) | |
| tree | 367001447fda9438c5beb03f2fb09bbe7e2b2abd /indra/newview/llface.h | |
| parent | 6a89cb6f25adafdf07a4241e7bbe6fee758c1048 (diff) | |
| parent | a4f121f065c580ac34e8caa666855c95eb29138b (diff) | |
Pull merge from lindenlab/viewer-acme
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(); |