summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-05-18 15:56:24 -0400
committerprep <prep@lindenlab.com>2011-05-18 15:56:24 -0400
commitc84e84cfbf101deb0a920bd95b3a8a7b16806d04 (patch)
tree0abb2b697d6dbe93cb9f6d702355018ad2fac6fc /indra/newview/llfloatermodelpreview.h
parent6f2e77522aded8c386edad8c4fb3a855272b3d3c (diff)
Fix for sh-1227. Decoupled avatar in preview window from in world avatar. Code cleanup.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r--indra/newview/llfloatermodelpreview.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index b54a72e555..f6d4a08d1f 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -341,6 +341,9 @@ public:
LLVector3 getTranslationForJointOffset( std::string joint );
+ void createPreviewAvatar( void );
+ LLVOAvatar* getPreviewAvatar( void ) { return mPreviewAvatar; }
+
protected:
friend class LLModelLoader;
friend class LLFloaterModelPreview;
@@ -422,6 +425,7 @@ public:
std::deque<std::string> mMasterLegacyJointList;
std::deque<std::string> mJointsFromNode;
JointTransformMap mJointTransformMap;
+ LLPointer<LLVOAvatar> mPreviewAvatar;
};
#endif // LL_LLFLOATERMODELPREVIEW_H