diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-27 12:27:05 -0400 |
| commit | a3d89650a9a485902982ac066b2a4e9cf642989d (patch) | |
| tree | da1723ade50571e7fe1fe15e43a1b9cb595b5ae5 /indra/llprimitive/llprimitive.cpp | |
| parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
| parent | 154a465bdaff58023c43bed12b4a049ae72a55df (diff) | |
merged .hgtags from viewer-pre-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; |