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

Maybe this will help it build on windows

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-22 10:45:18 -03:00
parent 6185b0fb0c
commit 4ecf6055ce
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llvoavatar.cpp
View File

@@ -223,9 +223,10 @@ public:
} }
BOOL parseXml(LLXmlTreeNode* node); BOOL parseXml(LLXmlTreeNode* node);
BOOL mIsJoint;
private: private:
std::string mName; std::string mName;
BOOL mIsJoint;
LLVector3 mPos; LLVector3 mPos;
LLVector3 mRot; LLVector3 mRot;
LLVector3 mScale; LLVector3 mScale;
@@ -752,13 +753,13 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mNeedsSkin(FALSE), mNeedsSkin(FALSE),
mUpdatePeriod(1), mUpdatePeriod(1),
mFullyLoadedInitialized(FALSE), mFullyLoadedInitialized(FALSE),
mHasBakedHair( FALSE ), mHasBakedHair( FALSE )
// <edit> // <edit>
mNametagSaysIdle(false), // mNametagSaysIdle(false),
mIdleForever(true), // mIdleForever(true),
mIdleMinutes(0), // mIdleMinutes(0),
mFocusObject(LLUUID::null), // mFocusObject(LLUUID::null),
mFocusVector(LLVector3d::zero) // mFocusVector(LLVector3d::zero)
// </edit> // </edit>
{ {
LLMemType mt(LLMemType::MTYPE_AVATAR); LLMemType mt(LLMemType::MTYPE_AVATAR);
@@ -3071,8 +3072,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mNameText->setUseBubble(TRUE); mNameText->setUseBubble(TRUE);
sNumVisibleChatBubbles++; sNumVisibleChatBubbles++;
new_name = TRUE; new_name = TRUE;
}
} }
// <edit> // <edit>

20
indra/newview/llvoavatar.h
View File

@@ -684,7 +684,8 @@ protected:
S32 getLocalDiscardLevel(LLVOAvatarDefines::ETextureIndex index); S32 getLocalDiscardLevel(LLVOAvatarDefines::ETextureIndex index);
public: public:
static void updateFreezeCounter(S32 counter = 0 ); static void updateFreezeCounter(S32 counter = 0 );
// <edit> // <edit>
public: public:
//bool mNametagSaysIdle; //bool mNametagSaysIdle;
//bool mIdleForever; //bool mIdleForever;
@@ -694,6 +695,23 @@ public:
LLVector3d mFocusVector; LLVector3d mFocusVector;
//void resetIdleTime(); //void resetIdleTime();
// </edit> // </edit>
private:
static S32 sFreezeCounter;
//-----------------------------------------------------------------------------------------------
// Avatar skeleton setup.
//-----------------------------------------------------------------------------------------------
private:
BOOL loadAvatar();
BOOL setupBone(const LLVOAvatarBoneInfo* info, LLViewerJoint* parent, S32 &current_volume_num, S32 &current_joint_num);
BOOL buildSkeleton(const LLVOAvatarSkeletonInfo *info);
//-----------------------------------------------------------------------------------------------
// Per-avatar information about texture data.
// To-do: Move this to private implementation class
//-----------------------------------------------------------------------------------------------
struct BakedTextureData struct BakedTextureData
{ {
LLUUID mLastTextureIndex; LLUUID mLastTextureIndex;