diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-12 22:18:34 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2007-07-12 22:18:34 +0000 |
| commit | 42f7199fdb37ee192fd567f41fb7e1130dc7978d (patch) | |
| tree | 8510866a8d7fa6a93bc998af4e05601173dee41b | |
| parent | b55c8fe2da97e14d17f9c4130930343cc517a804 (diff) | |
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
| -rw-r--r-- | indra/llmessage/llmessagetemplateparser.cpp | 1 | ||||
| -rw-r--r-- | indra/lscript/lscript_compile/indra.l | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerjointmesh_sse2.cpp | 2 | ||||
| -rw-r--r-- | indra/test/llmessagetemplateparser_tut.cpp | 1 | ||||
| -rw-r--r-- | indra/test/llpermissions_tut.cpp | 1 | ||||
| -rwxr-xr-x | indra/test/llsdmessagereader_tut.cpp | 1 | ||||
| -rw-r--r-- | indra/test/lltemplatemessagebuilder_tut.cpp | 1 | ||||
| -rw-r--r-- | indra/test/message_tut.cpp | 1 |
8 files changed, 9 insertions, 0 deletions
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" |