diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-03 09:37:03 -0400 |
| commit | b8e97adced58f81a52e6b76a14309d275d55c8bc (patch) | |
| tree | 9f2710cbb13093c509896f184a025ab7469c934c /indra/llprimitive/llvolumemessage.cpp | |
| parent | abc259618f06f69ba8e7c72cb149bcddc1bb6ddf (diff) | |
| parent | e58c809a5816383674d0f1957440fad728e88893 (diff) | |
merge changes for OPEN-39
Diffstat (limited to 'indra/llprimitive/llvolumemessage.cpp')
| -rw-r--r-- | indra/llprimitive/llvolumemessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llvolumemessage.cpp b/indra/llprimitive/llvolumemessage.cpp index b6cae5c4df..58b23bebd2 100644 --- a/indra/llprimitive/llvolumemessage.cpp +++ b/indra/llprimitive/llvolumemessage.cpp @@ -94,7 +94,7 @@ bool LLVolumeMessage::packProfileParams( bool LLVolumeMessage::unpackProfileParams( LLProfileParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num) { bool ok = true; @@ -322,7 +322,7 @@ bool LLVolumeMessage::packPathParams( bool LLVolumeMessage::unpackPathParams( LLPathParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num) { U8 curve; @@ -522,7 +522,7 @@ bool LLVolumeMessage::packVolumeParams(const LLVolumeParams* params, LLDataPacke bool LLVolumeMessage::unpackVolumeParams( LLVolumeParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num) { bool ok = true; |