From 42f7199fdb37ee192fd567f41fb7e1130dc7978d Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Thu, 12 Jul 2007 22:18:34 +0000
Subject: svn merge -r65092:65220
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837

---
 indra/llmessage/llmessagetemplateparser.cpp | 1 +
 indra/lscript/lscript_compile/indra.l       | 1 +
 indra/newview/llviewerjointmesh_sse2.cpp    | 2 ++
 indra/test/llmessagetemplateparser_tut.cpp  | 1 +
 indra/test/llpermissions_tut.cpp            | 1 +
 indra/test/llsdmessagereader_tut.cpp        | 1 +
 indra/test/lltemplatemessagebuilder_tut.cpp | 1 +
 indra/test/message_tut.cpp                  | 1 +
 8 files changed, 9 insertions(+)

diff --git a/indra/llmessage/llmessagetemplateparser.cpp b/indra/llmessage/llmessagetemplateparser.cpp
index 9c6dd8c73a..037725d3b2 100644
--- a/indra/llmessage/llmessagetemplateparser.cpp
+++ b/indra/llmessage/llmessagetemplateparser.cpp
@@ -6,6 +6,7 @@
  * $License$
  */
 
+#include "linden_common.h"
 #include "llmessagetemplateparser.h"
 #include <boost/tokenizer.hpp>
 
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index e8aa073c63..524f2089fd 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -1,3 +1,4 @@
+
 N			[0-9]
 L			[a-zA-Z_]
 H			[a-fA-F0-9]
diff --git a/indra/newview/llviewerjointmesh_sse2.cpp b/indra/newview/llviewerjointmesh_sse2.cpp
index 84e50736ab..41f86d363f 100644
--- a/indra/newview/llviewerjointmesh_sse2.cpp
+++ b/indra/newview/llviewerjointmesh_sse2.cpp
@@ -38,6 +38,8 @@
 #if LL_VECTORIZE
 
 
+static LLV4Matrix4	sJointMat[32];
+
 inline void matrix_translate(LLV4Matrix4& m, const LLMatrix4* w, const LLVector3& j)
 {
 	m.mV[VX] = _mm_loadu_ps(w->mMatrix[VX]);
diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp
index 2f76d7fb20..1faa4e90cb 100644
--- a/indra/test/llmessagetemplateparser_tut.cpp
+++ b/indra/test/llmessagetemplateparser_tut.cpp
@@ -9,6 +9,7 @@
 
 #include <tut/tut.h>
 #include "lltut.h"
+#include "linden_common.h"
 #include "llmessagetemplateparser.h"
 
 namespace tut
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 1a1e392a65..4451edd80b 100644
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -9,6 +9,7 @@
  */
  
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "message.h"
 #include "llpermissions.h"
diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp
index 60a4ea0f29..2c3a3d81f6 100755
--- a/indra/test/llsdmessagereader_tut.cpp
+++ b/indra/test/llsdmessagereader_tut.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 
 #include "message.h"
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
index 67ca9320ba..5bb37b3b92 100644
--- a/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 
 #include "llapr.h"
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
index a08c3130f1..b2c84d5f54 100644
--- a/indra/test/message_tut.cpp
+++ b/indra/test/message_tut.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 
 #include "llapr.h"
-- 
cgit v1.2.3