From 721a2ac06a8561efc822581c7d0c4c8bb2f37377 Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Mon, 22 Jul 2013 21:32:22 +0300 Subject: MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine region --- indra/newview/llface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llface.h') diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 763634a3ab..0687544d53 100755 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -195,7 +195,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); + const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume = FALSE); void init(LLDrawable* drawablep, LLViewerObject* objp); void destroy(); -- cgit v1.2.3 From f48581b62523670558f6a9fb01fa012d3dc9d61e Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 25 Sep 2013 13:52:10 -0700 Subject: Fix decl of merged genBBoxes func to match merge impl --- indra/newview/llface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llface.h') diff --git a/indra/newview/llface.h b/indra/newview/llface.h index fe16920aa4..c9037ce1eb 100755 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -195,7 +195,7 @@ public: void setSize(S32 numVertices, S32 num_indices = 0, bool align = false); BOOL genVolumeBBoxes(const LLVolume &volume, S32 f, - const LLMatrix4& mat_vert_in, const LLMatrix3& mat_normal_in, BOOL global_volume = FALSE); + const LLMatrix4& mat_vert_in, BOOL global_volume = FALSE); void init(LLDrawable* drawablep, LLViewerObject* objp); void destroy(); -- cgit v1.2.3