From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Wed, 11 Jul 2007 21:29:02 +0000
Subject: svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088
 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired
 by Tess and rdw.

---
 indra/newview/llviewerjointmesh_vec.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/llviewerjointmesh_vec.cpp')

diff --git a/indra/newview/llviewerjointmesh_vec.cpp b/indra/newview/llviewerjointmesh_vec.cpp
index 69ddad63fc..c04c323800 100644
--- a/indra/newview/llviewerjointmesh_vec.cpp
+++ b/indra/newview/llviewerjointmesh_vec.cpp
@@ -25,11 +25,10 @@
 // Generic vectorized code, uses compiler defaults, works well for Altivec
 // on PowerPC.
 
-static LLV4Matrix4	sJointMat[32];
-
 // static
 void LLViewerJointMesh::updateGeometryVectorized(LLFace *face, LLPolyMesh *mesh)
 {
+	static LLV4Matrix4	sJointMat[32];
 	LLDynamicArray<LLJointRenderData*>& joint_data = mesh->getReferenceMesh()->mJointRenderData;
 	S32 j, joint_num, joint_end = joint_data.count();
 	LLV4Vector3 pivot;
-- 
cgit v1.3