diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-21 17:05:35 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-21 17:05:35 -0600 |
| commit | aa7e36f35b2588bcf3a90892a041a12c32ab53f4 (patch) | |
| tree | 4ce8e7da3d7006d7f386f7792ab803948b417dbf /indra/llcharacter/llcharacter.h | |
| parent | 2ac1fe03e85b6b81076a4cfff86ee2ef5af178c4 (diff) | |
| parent | cff4c6e8856dabb899473af30ab6d08d8a7dc370 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
| -rw-r--r-- | indra/llcharacter/llcharacter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h index a6347fcc3c..e81a27c2bc 100644 --- a/indra/llcharacter/llcharacter.h +++ b/indra/llcharacter/llcharacter.h @@ -266,6 +266,7 @@ public: void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; } static std::vector< LLCharacter* > sInstances; + static BOOL sAllowInstancesChange ; //debug use protected: LLMotionController mMotionController; |