diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:31:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:31:56 -0400 |
| commit | 9698314736252b248921bb3a3459f2bdf539ffba (patch) | |
| tree | cff4957f66ae90248466a0dccd6e5886dfb62f55 /indra/llprimitive/llprimitive.cpp | |
| parent | ed2222be5d33cb4216e6826507ae1d06e9781253 (diff) | |
| parent | 2c584790d0505ebff13d29e9f068aefcffe54f01 (diff) | |
merge changes for storm-399
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; |