diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:38:08 -0500 |
| commit | e0d77c277a46fa1161505a177e99b456854a98fd (patch) | |
| tree | 9c0bb28f90368e34fb907950ca54b94df85b5fa2 /indra/newview/llfloatermodelpreview.h | |
| parent | c87142e5d779fb3d5375842658a63a1af2573094 (diff) | |
| parent | e7f3f3bdbbec310030209e09d389cd434adb7991 (diff) | |
Automated merge from mesh-development
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 e233f3672a..64b220d86b 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -52,6 +52,8 @@ class domTranslate; class LLMenuButton; class LLToggleableMenu; +const S32 NUM_LOD = 4;
+ class LLModelLoader : public LLThread { public: @@ -258,7 +260,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex void clearModel(S32 lod); void loadModel(std::string filename, S32 lod); void loadModelCallback(S32 lod); - void genLODs(S32 which_lod = -1); + void genLODs(S32 which_lod = -1, U32 decimation = 3); void generateNormals(); void consolidate(); void clearMaterials(); @@ -278,7 +280,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex friend class LLFloaterModelPreview::DecompRequest; friend class LLPhysicsDecomp; - LLFloater* mFMP; + LLFloater* mFMP; BOOL mNeedsUpdate; bool mDirty; |