diff options
| author | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
| commit | 9c7e38a3d1318f05f43f404e04dbd619a17a3e31 (patch) | |
| tree | 0b48d8e70ca1ce75c71d9a0b29bcb60e015de632 /indra/newview/llfloatermodelpreview.h | |
| parent | 1ff941362fa5617a94fb85839d6540e5abb1b78a (diff) | |
| parent | d46594bf714cd19ebcbf693463c4d39e4c771bb8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 8fc85cebb9..e1c520134b 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -279,7 +279,7 @@ public: void loadModelCallback(S32 lod); void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false); void generateNormals(); - void consolidate(); + void clearMaterials(); U32 calcResourceCost(); void rebuildUploadData(); |