Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate llpoly* files to llappearance

Browse Source
This commit is contained in:
Shyotl
2012-12-20 02:55:34 -06:00
parent f9d205b869
commit 003aa6a4eb
12 changed files with 203 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerjoint.h
View File

@@ -31,7 +31,9 @@
// Header Files
//-----------------------------------------------------------------------------
#include "lljoint.h"
#include "llavatarjoint.h"
#include "lljointpickname.h"
#include "llavatarjoint.h"
class LLFace;
class LLViewerJointMesh;
@@ -40,7 +42,7 @@ class LLViewerJointMesh;
// class LLViewerJoint
//-----------------------------------------------------------------------------
class LLViewerJoint :
public LLJoint
public LLAvatarJoint
{
public:
LLViewerJoint();
@@ -134,17 +136,17 @@ protected:
S32 mMeshID;
};
class LLViewerJointCollisionVolume : public LLViewerJoint
class LLViewerJointCollisionVolume : public LLAvatarJointCollisionVolume
{
public:
LLViewerJointCollisionVolume();
LLViewerJointCollisionVolume(const std::string &name, LLJoint *parent = NULL);
LLViewerJointCollisionVolume(const std::string &name, LLJoint *parent = NULL) {}
virtual ~LLViewerJointCollisionVolume() {};
virtual BOOL inheritScale() { return TRUE; }
void renderCollision();
LLVector3 getVolumePos(LLVector3 &offset);
virtual void renderCollision();
virtual LLVector3 getVolumePos(LLVector3 &offset);
};
#endif // LL_LLVIEWERJOINT_H