diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
| commit | 662a92784328f31b680f4f049350dd0f6cacf4c7 (patch) | |
| tree | 81c6c9634d919941e683f5d2e3ca0dd8c0c655cd /indra/llcharacter/llcharacter.h | |
| parent | 6be68618c4b32082228d9c34083542017b84482f (diff) | |
| parent | 7a85df942916b8387fd822a9e22cb0857c258be5 (diff) | |
merge changes for shining branch
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; |