diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llmessage/lltemplatemessagereader.cpp | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.cpp')
| -rw-r--r-- | indra/llmessage/lltemplatemessagereader.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index 9015be7106..3e08b9de26 100644 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -6,6 +6,7 @@ * $License$ */ +#include "linden_common.h" #include "lltemplatemessagereader.h" #include "llfasttimer.h" @@ -331,7 +332,7 @@ void LLTemplateMessageReader::getF64(const char *block, const char *var, void LLTemplateMessageReader::getVector3(const char *block, const char *var, LLVector3 &v, S32 blocknum ) { - getData(block, var, v.mV, sizeof(v.mV), blocknum); + getData(block, var, &v.mV[0], sizeof(v.mV), blocknum); if( !v.isFinite() ) { @@ -344,7 +345,7 @@ void LLTemplateMessageReader::getVector3(const char *block, const char *var, void LLTemplateMessageReader::getVector4(const char *block, const char *var, LLVector4 &v, S32 blocknum) { - getData(block, var, v.mV, sizeof(v.mV), blocknum); + getData(block, var, &v.mV[0], sizeof(v.mV), blocknum); if( !v.isFinite() ) { @@ -357,7 +358,7 @@ void LLTemplateMessageReader::getVector4(const char *block, const char *var, void LLTemplateMessageReader::getVector3d(const char *block, const char *var, LLVector3d &v, S32 blocknum ) { - getData(block, var, v.mdV, sizeof(v.mdV), blocknum); + getData(block, var, &v.mdV[0], sizeof(v.mdV), blocknum); if( !v.isFinite() ) { @@ -372,7 +373,7 @@ void LLTemplateMessageReader::getQuat(const char *block, const char *var, LLQuaternion &q, S32 blocknum) { LLVector3 vec; - getData(block, var, vec.mV, sizeof(vec.mV), blocknum); + getData(block, var, &vec.mV[0], sizeof(vec.mV), blocknum); if( vec.isFinite() ) { q.unpackFromVector3( vec ); @@ -388,7 +389,7 @@ void LLTemplateMessageReader::getQuat(const char *block, const char *var, void LLTemplateMessageReader::getUUID(const char *block, const char *var, LLUUID &u, S32 blocknum) { - getData(block, var, u.mData, sizeof(u.mData), blocknum); + getData(block, var, &u.mData[0], sizeof(u.mData), blocknum); } inline void LLTemplateMessageReader::getIPAddr(const char *block, const char *var, U32 &u, S32 blocknum) |