summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.h
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-05-04 17:18:31 -0400
committerprep linden <prep@lindenlab.com>2011-05-04 17:18:31 -0400
commit91980918f0341bec0145156875d22503e8beea4e (patch)
tree9f88df92825ec4f5a6c93cc6f9b2fa22572166d9 /indra/newview/llfloatermodelpreview.h
parentf3b0b5f3f1654a1df30d4516aca328f3add31fa0 (diff)
Fix for Sh-1481
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r--indra/newview/llfloatermodelpreview.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 7927edcd36..92104c01f4 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -339,8 +339,10 @@ public:
U32 getLoadState() { return mLoadState; }
//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist
void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }
- bool getResetJointFlag( void ) { return mResetJoints; }
-
+ const bool getResetJointFlag( void ) const { return mResetJoints; }
+ void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }
+ const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }
+
LLVector3 getTranslationForJointOffset( std::string joint );
protected:
@@ -370,6 +372,8 @@ public:
bool mLoading;
U32 mLoadState;
bool mResetJoints;
+ bool mRigParityWithScene;
+
std::map<std::string, bool> mViewOption;
//GLOD object parameters (must rebuild object if these change)