diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-14 18:53:17 +0300 |
commit | 1dd7e76908277f0ad4b24a8e320aa2b9f9321048 (patch) | |
tree | c9ca7fd71fdf533c7f500828e1e708dc5d7af5ac /indra/newview/llfloatermodelpreview.h | |
parent | 3e0483df17181269c4cada7ad5585201f442598c (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
Merge with viewer-release and become 3.7.28
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 86ce851ed1..2d0d42f26f 100755 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -263,6 +263,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); @@ -371,6 +372,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; |