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/llvolumemessage.h | |
parent | 71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff) | |
parent | 154a465bdaff58023c43bed12b4a049ae72a55df (diff) |
merged .hgtags from viewer-pre-release
Diffstat (limited to 'indra/llprimitive/llvolumemessage.h')
-rw-r--r-- | indra/llprimitive/llvolumemessage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llvolumemessage.h b/indra/llprimitive/llvolumemessage.h index 33562323c3..f59ee79c60 100644 --- a/indra/llprimitive/llvolumemessage.h +++ b/indra/llprimitive/llvolumemessage.h @@ -49,7 +49,7 @@ protected: static bool unpackProfileParams( LLProfileParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num = 0); static bool unpackProfileParams(LLProfileParams* params, LLDataPacker& dp); @@ -60,7 +60,7 @@ protected: static bool unpackPathParams( LLPathParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num = 0); static bool unpackPathParams(LLPathParams* params, LLDataPacker& dp); @@ -83,7 +83,7 @@ public: static bool unpackVolumeParams( LLVolumeParams* params, LLMessageSystem* mesgsys, - char* block_name, + char const* block_name, S32 block_num = 0); static bool unpackVolumeParams(LLVolumeParams* params, LLDataPacker &dp); }; |