diff options
| author | Richard Linden <none@none> | 2012-04-12 17:18:58 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-12 17:18:58 -0700 |
| commit | 8437bfb66ed78e5d4d16cf4458e19a5b25a74adb (patch) | |
| tree | 7841b4fb65f59cddedeb90976a61eb7cab404838 /indra/newview | |
| parent | 1e74372f50a2cb2ed3364e79344b0408e7e8d89b (diff) | |
| parent | 855fbc0bf331c116d20d402f427535f060f70345 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f47cce9a4d..c483aa58c9 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -248,7 +248,7 @@ struct LLVOAvatarCollisionVolumeInfo : public LLInitParam::Block<LLVOAvatarColli struct LLVOAvatarChildJoint : public LLInitParam::ChoiceBlock<LLVOAvatarChildJoint> { - Alternative<Lazy<struct LLVOAvatarBoneInfo> > bone; + Alternative<Lazy<struct LLVOAvatarBoneInfo, IS_BLOCK> > bone; Alternative<LLVOAvatarCollisionVolumeInfo> collision_volume; LLVOAvatarChildJoint() |