diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
| commit | c77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (patch) | |
| tree | d30164242aa4af36f721033eb7a93fb2f2198de4 /indra/llprimitive/llprimitive.cpp | |
| parent | f1b1dbaba54ce678e6ec5311d4b50ded3f91d58c (diff) | |
| parent | e0adaa188ba06b6d3f3282121d149193de87c6e6 (diff) | |
merge changes for storm-250
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; |