Intermiediary commit.
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
LLStringTable LLCharacter::sVisualParamNames(1024);
|
||||
|
||||
std::vector< LLCharacter* > LLCharacter::sInstances;
|
||||
BOOL LLCharacter::sAllowInstancesChange = TRUE ;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// LLCharacter()
|
||||
@@ -51,7 +50,6 @@ LLCharacter::LLCharacter()
|
||||
mAppearanceSerialNum( 0 ),
|
||||
mSkeletonSerialNum( 0 )
|
||||
{
|
||||
llassert_always(sAllowInstancesChange) ;
|
||||
sInstances.push_back(this);
|
||||
|
||||
mMotionController.setCharacter( this );
|
||||
@@ -75,8 +73,6 @@ LLCharacter::~LLCharacter()
|
||||
bool erased = vector_replace_with_last(sInstances,this);
|
||||
|
||||
llassert_always(erased) ;
|
||||
|
||||
llassert_always(sAllowInstancesChange) ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -267,7 +267,6 @@ public:
|
||||
void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; }
|
||||
|
||||
static std::vector< LLCharacter* > sInstances;
|
||||
static BOOL sAllowInstancesChange ; //debug use
|
||||
|
||||
virtual void setHoverOffset(const LLVector3& hover_offset, bool send_update=true) { mHoverOffset = hover_offset; }
|
||||
const LLVector3& getHoverOffset() const { return mHoverOffset; }
|
||||
|
||||
Reference in New Issue
Block a user