diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
| commit | e119b26f03377b32988456d3fc4ed9605649c191 (patch) | |
| tree | 4d8043344bd5a276a0fcdc26eac07ef3c3d51c77 /indra/llprimitive/llprimitive.cpp | |
| parent | 95fcff557f19712e23410a07751f2b571fead8a9 (diff) | |
| parent | 647a270ee22ab38044013c8098babc20b9287ec7 (diff) | |
merged tip of viewer-beta at changeset 9de6fc07304f
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; |