diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
commit | f393774caf49313f24d33cb2b33b6ad92c70977f (patch) | |
tree | ebdaf44b4c3152362f3e9b18c227bd09d39031d5 /indra/llprimitive/llvolumemessage.cpp | |
parent | 31e16be0daa10e6d66b133c308130524a7a0d881 (diff) | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) |
Merge from lindenlab/viewer-development
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; |