diff options
author | prep <prep@lindenlab.com> | 2011-03-30 16:04:36 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2011-03-30 16:04:36 -0400 |
commit | 69789e40d9df7a13913a88bc02316e8bbc4a4dac (patch) | |
tree | a78a5ef317aef42f7757c365abd8d365ce00a0e5 /indra/newview/llfloatermodelpreview.h | |
parent | 5aeac734bcfe92364a982dc31dcd6d483df25eac (diff) |
Moved joint reset flag into model preview
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r-- | indra/newview/llfloatermodelpreview.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 6542ed4fbe..3fcc1b3e57 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -126,7 +126,6 @@ public: //map of avatar joints as named in COLLADA assets to internal joint names std::map<std::string, std::string> mJointMap; std::deque<std::string> mMasterJointList; - bool mResetJoints; }; class LLFloaterModelPreview : public LLFloater @@ -310,6 +309,9 @@ public: void setLoadState( U32 state ) { mLoadState = state; } U32 getLoadState() { return mLoadState; } + void setResetJointFlag( bool state ) { mResetJoints = state; } + bool getResetJointFlag( void ) { return mResetJoints; } + protected: friend class LLModelLoader; friend class LLFloaterModelPreview; @@ -336,7 +338,7 @@ public: std::string mLODFile[LLModel::NUM_LODS]; bool mLoading; U32 mLoadState; - + bool mResetJoints; std::map<std::string, bool> mViewOption; //GLOD object parameters (must rebuild object if these change) |