diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:15:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-14 15:15:48 -0400 |
| commit | 572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch) | |
| tree | 4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/llprimitive/llprimitive.cpp | |
| parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
| parent | b49446c863644d603ec2e1f86f12d24b1c4375c2 (diff) | |
pull back tags from viewer-release
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 258c0c3c15..f9ef897aa3 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -1216,12 +1216,12 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const return FALSE; } -S32 LLPrimitive::unpackTEMessage(LLMessageSystem *mesgsys, char *block_name) +S32 LLPrimitive::unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name) { return(unpackTEMessage(mesgsys,block_name,-1)); } -S32 LLPrimitive::unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num) +S32 LLPrimitive::unpackTEMessage(LLMessageSystem* mesgsys, char const* block_name, const S32 block_num) { // use a negative block_num to indicate a single-block read (a non-variable block) S32 retval = 0; |