From a9803a0f96e0c6085034e46c019c8f29ccacb07f Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Thu, 22 Apr 2010 00:03:18 -0300 Subject: [PATCH] accidentally removed a bit of llvoavatar.h --- indra/newview/llvoavatar.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d116fb58f..7e4714d6e 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -686,6 +686,7 @@ protected: public: static void updateFreezeCounter(S32 counter = 0 ); // +public: //bool mNametagSaysIdle; //bool mIdleForever; //LLFrameTimer mIdleTimer; @@ -693,7 +694,18 @@ public: LLUUID mFocusObject; LLVector3d mFocusVector; //void resetIdleTime(); -// +// + 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 mJoints[i]->mMeshParts + }; typedef std::vector bakedtexturedata_vec_t; bakedtexturedata_vec_t mBakedTextureData;