diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/llprimitive/llvolumemessage.cpp | |
parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) |
merge changes for storm-1057
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; |