diff options
author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
---|---|---|
committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llfloatermodelpreview.h | |
parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
parent | 82ae214f6a367e17dd335e80e2444cf672108821 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rwxr-xr-x | indra/newview/llfloatermodelpreview.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 6c0c60b87f..618748bd4e 100755 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -343,6 +343,7 @@ public: void loadModelCallback(S32 lod); void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false); void generateNormals(); + void restoreNormals(); U32 calcResourceCost(); void rebuildUploadData(); void saveUploadData(bool save_skinweights, bool save_joint_poisitions); @@ -447,6 +448,12 @@ private: LLModelLoader::model_list mModel[LLModel::NUM_LODS]; LLModelLoader::model_list mBaseModel; + typedef std::vector<LLVolumeFace> v_LLVolumeFace_t; + typedef std::vector<v_LLVolumeFace_t> vv_LLVolumeFace_t; + + vv_LLVolumeFace_t mModelFacesCopy[LLModel::NUM_LODS]; + vv_LLVolumeFace_t mBaseModelFacesCopy; + U32 mGroup; std::map<LLPointer<LLModel>, U32> mObject; U32 mMaxTriangleLimit; |