diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
| commit | 613894c8cca25f9fa86da7056da3594fe8771d46 (patch) | |
| tree | 4667e95a7041fe8d2b08209c73a803f8370a01f1 /indra/newview/llfloatermodelpreview.h | |
| parent | 7c2b9221d6678ea7a04f529efaa2e557abce504d (diff) | |
SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
Remove llfloaterimportcollada
Reviewed by Prep.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 5de3ebf5e3..08ac3873db 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -113,12 +113,14 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex LLModelPreview(S32 width, S32 height, LLFloaterModelPreview* fmp); virtual ~LLModelPreview(); + void resetPreviewTarget(); void setPreviewTarget(F32 distance); void setTexture(U32 name) { mTextureName = name; } BOOL render(); void update(); - void genBuffers(S32 lod); + void genBuffers(S32 lod, bool skinned); + void clearBuffers(); void refresh(); void rotate(F32 yaw_radians, F32 pitch_radians); void zoom(F32 zoom_amt); @@ -225,6 +227,9 @@ protected: friend class LLPhysicsDecomp; friend class LLPhysicsDecompFloater; + static void onUploadJointsCommit(LLUICtrl*,void*); + static void onUploadSkinCommit(LLUICtrl*,void*); + static void onPreviewLODCommit(LLUICtrl*,void*); static void onHighLODCommit(LLUICtrl*,void*); |