diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-06 18:54:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-06 18:54:50 -0500 |
| commit | 71eb68a85d5a5157622ae8f42bac1c21f00d54cd (patch) | |
| tree | 60062a3d8b9e6bd6c3d83b8e36ae7e116c84f766 /indra/newview/llfloatermodelpreview.h | |
| parent | bab80fed2f1404b5b13aed5ac87911f852be3bfb (diff) | |
Fix for "set to default" button not resetting some data.
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 119c593221..56098c6250 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -162,6 +162,8 @@ public: virtual BOOL postBuild(); + void initModelPreview(); + BOOL handleMouseDown(S32 x, S32 y, MASK mask); BOOL handleMouseUp(S32 x, S32 y, MASK mask); BOOL handleHover(S32 x, S32 y, MASK mask); @@ -187,7 +189,7 @@ public: void updateResourceCost(); void loadModel(S32 lod); - void loadModel(S32 lod, const std::string& file_name); + void loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = false); void onViewOptionChecked(const LLSD& userdata); bool isViewOptionChecked(const LLSD& userdata); @@ -324,7 +326,7 @@ public: virtual BOOL needsRender() { return mNeedsUpdate; } void setPreviewLOD(S32 lod); void clearModel(S32 lod); - void loadModel(std::string filename, S32 lod); + void loadModel(std::string filename, S32 lod, bool force_disable_slm = false); void loadModelCallback(S32 lod); void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false); void generateNormals(); |