Large snapshot update (part 2)

This commit is contained in:
Aleric Inglewood
2012-12-14 01:00:27 +01:00
parent d8bc84adb1
commit 15b6593143
21 changed files with 884 additions and 495 deletions

View File

@@ -50,7 +50,7 @@ BOOL LLCharacter::sAllowInstancesChange = TRUE ;
// LLCharacter()
// Class Constructor
//-----------------------------------------------------------------------------
LLCharacter::LLCharacter()
LLCharacter::LLCharacter(bool freeze_time)
:
mPreferredPelvisHeight( 0.f ),
mSex( SEX_FEMALE ),
@@ -62,6 +62,7 @@ LLCharacter::LLCharacter()
mMotionController.setCharacter( this );
mPauseRequest = new LLPauseRequestHandle();
mFreezeTimeHidden = freeze_time;
}

View File

@@ -62,7 +62,7 @@ class LLCharacter
{
public:
// Constructor
LLCharacter();
LLCharacter(bool freeze_time);
// Destructor
virtual ~LLCharacter();
@@ -277,6 +277,8 @@ public:
static std::vector< LLCharacter* > sInstances;
static BOOL sAllowInstancesChange ; //debug use
void resetFreezeTimeHidden() { mFreezeTimeHidden = false; }
protected:
LLMotionController mMotionController;
@@ -288,6 +290,7 @@ protected:
U32 mAppearanceSerialNum;
U32 mSkeletonSerialNum;
LLAnimPauseRequest mPauseRequest;
bool mFreezeTimeHidden; // True when this object was created during snapshot FreezeTime mode, and that mode is STILL active.
private:
// visual parameter stuff