summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-02-22 18:33:33 -0600
committerDave Parks <davep@lindenlab.com>2011-02-22 18:33:33 -0600
commitc690c30ec173faf8d8087ecb38cadbb9dd1adb4e (patch)
tree4ba601c39592cf2d36fc568714060280da4dcad3 /indra/newview/llfloatermodelpreview.h
parentadd08538af7bc6c19507835688ac6f970184bb6f (diff)
SH-438 Use node name instead of mesh name for object names when importing meshes.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r--indra/newview/llfloatermodelpreview.h2
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();