diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-07 23:17:38 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-07 23:17:38 -0400 |
| commit | a89ec17529d183e61fc98a8cd5fa73dceb90ec9c (patch) | |
| tree | be9c97633eb5ff75a384db2d9be95fb508d6a37a /indra/newview/llpolymorph.h | |
| parent | 5f8b94094877730082340dc21ff0162b6177a427 (diff) | |
| parent | 77b33d9623c08152932282048fe847d79fcf43cd (diff) | |
Automated merge with https://bitbucket.org/don_linden/sunshine-experimental
Diffstat (limited to 'indra/newview/llpolymorph.h')
| -rw-r--r-- | indra/newview/llpolymorph.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h index 46e23b7792..28d7755d4d 100644 --- a/indra/newview/llpolymorph.h +++ b/indra/newview/llpolymorph.h @@ -35,7 +35,7 @@ class LLPolyMeshSharedData; class LLVOAvatar; class LLVector2; -class LLViewerJointCollisionVolume; +class LLAvatarJointCollisionVolume; class LLWearable; //----------------------------------------------------------------------------- @@ -104,10 +104,10 @@ struct LLPolyVolumeMorphInfo struct LLPolyVolumeMorph { - LLPolyVolumeMorph(LLViewerJointCollisionVolume* volume, LLVector3 scale, LLVector3 pos) + LLPolyVolumeMorph(LLAvatarJointCollisionVolume* volume, LLVector3 scale, LLVector3 pos) : mVolume(volume), mScale(scale), mPos(pos) {}; - LLViewerJointCollisionVolume* mVolume; + LLAvatarJointCollisionVolume* mVolume; LLVector3 mScale; LLVector3 mPos; }; |