aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter
diff options
context:
space:
mode:
authorArmin Weatherwax2010-02-22 17:57:35 +0100
committerJacek Antonelli2010-03-05 14:18:48 -0600
commitd0936606412ccaf05a2e17894d2bc9a3c18506ab (patch)
treefb15bb14014eb9f6cc0512f4f3fbf408de8459e3 /linden/indra/llcharacter
parentFixed some notifications that were ported from 1.2 incorrectly. (diff)
downloadmeta-impy-d0936606412ccaf05a2e17894d2bc9a3c18506ab.zip
meta-impy-d0936606412ccaf05a2e17894d2bc9a3c18506ab.tar.gz
meta-impy-d0936606412ccaf05a2e17894d2bc9a3c18506ab.tar.bz2
meta-impy-d0936606412ccaf05a2e17894d2bc9a3c18506ab.tar.xz
Ported breast physics from Emerald.
Diffstat (limited to 'linden/indra/llcharacter')
-rw-r--r--linden/indra/llcharacter/llcharacter.cpp3
-rw-r--r--linden/indra/llcharacter/llcharacter.h7
2 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 6633c65..dcdfe07 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -55,7 +55,8 @@ LLCharacter::LLCharacter()
55 mPreferredPelvisHeight( 0.f ), 55 mPreferredPelvisHeight( 0.f ),
56 mSex( SEX_FEMALE ), 56 mSex( SEX_FEMALE ),
57 mAppearanceSerialNum( 0 ), 57 mAppearanceSerialNum( 0 ),
58 mSkeletonSerialNum( 0 ) 58 mSkeletonSerialNum( 0 ),
59 mInAppearance( false )
59{ 60{
60 mMotionController.setCharacter( this ); 61 mMotionController.setCharacter( this );
61 sInstances.push_back(this); 62 sInstances.push_back(this);
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index 0112788..d91124b 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -253,6 +253,11 @@ public:
253 ESex getSex() { return mSex; } 253 ESex getSex() { return mSex; }
254 void setSex( ESex sex ) { mSex = sex; } 254 void setSex( ESex sex ) { mSex = sex; }
255 255
256 // set appearance flag
257 void setAppearanceFlag( bool flag ) { mInAppearance = flag; }
258 bool getAppearanceFlag() { return mInAppearance; }
259
260
256 U32 getAppearanceSerialNum() const { return mAppearanceSerialNum; } 261 U32 getAppearanceSerialNum() const { return mAppearanceSerialNum; }
257 void setAppearanceSerialNum( U32 num ) { mAppearanceSerialNum = num; } 262 void setAppearanceSerialNum( U32 num ) { mAppearanceSerialNum = num; }
258 263
@@ -273,6 +278,8 @@ protected:
273 U32 mSkeletonSerialNum; 278 U32 mSkeletonSerialNum;
274 LLAnimPauseRequest mPauseRequest; 279 LLAnimPauseRequest mPauseRequest;
275 280
281 BOOL mInAppearance;
282
276 283
277private: 284private:
278 // visual parameter stuff 285 // visual parameter stuff