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

accidentally removed a bit of llvoavatar.h

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-22 00:03:18 -03:00
parent a7463f4db5
commit a9803a0f96
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvoavatar.h
View File

@@ -686,6 +686,7 @@ protected:
public: public:
static void updateFreezeCounter(S32 counter = 0 ); static void updateFreezeCounter(S32 counter = 0 );
// <edit> // <edit>
public:
//bool mNametagSaysIdle; //bool mNametagSaysIdle;
//bool mIdleForever; //bool mIdleForever;
//LLFrameTimer mIdleTimer; //LLFrameTimer mIdleTimer;
@@ -694,6 +695,17 @@ public:
LLVector3d mFocusVector; LLVector3d mFocusVector;
//void resetIdleTime(); //void resetIdleTime();
// </edit> // </edit>
struct BakedTextureData
{
LLUUID mLastTextureIndex;
LLTexLayerSet* mTexLayerSet;
bool mIsLoaded;
bool mIsUsed;
LLVOAvatarDefines::ETextureIndex mTextureIndex;
U32 mMaskTexName;
// Stores pointers to the joint meshes that this baked texture deals with
std::vector< LLViewerJointMesh * > mMeshes; // std::vector<LLViewerJointMesh> mJoints[i]->mMeshParts
}; };
typedef std::vector<BakedTextureData> bakedtexturedata_vec_t; typedef std::vector<BakedTextureData> bakedtexturedata_vec_t;
bakedtexturedata_vec_t mBakedTextureData; bakedtexturedata_vec_t mBakedTextureData;