diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-19 12:56:04 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-19 12:56:04 -0700 |
| commit | 62011c2871bdb09b92c56d2959eed64ba6ec3e1f (patch) | |
| tree | 800b0c726c361a05a8e7b3025c7a14cca26f89c9 /indra/newview/llface.h | |
| parent | 3f186aab7737d611e1b8a62e66a79828e3b5ef5b (diff) | |
Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics
Diffstat (limited to 'indra/newview/llface.h')
| -rwxr-xr-x | indra/newview/llface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 763634a3ab..66b5f13740 100755 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -194,8 +194,7 @@ 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, BOOL global_volume = FALSE); void init(LLDrawable* drawablep, LLViewerObject* objp); void destroy(); |