diff options
| author | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
| commit | 75ddf612ad29240d6d34b5044ae09e4295217766 (patch) | |
| tree | 70eeb78247ef3ae779809485afaaf592aa495b34 /indra/llprimitive/llprimitive.cpp | |
| parent | 4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff) | |
| parent | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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; |