summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 40c892f06a..ff687386de 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -279,11 +279,6 @@ BOOL LLFloaterModelPreview::postBuild()
return FALSE;
}
-
-
-
-
-
childSetAction("lod_browse", onBrowseLOD, this);
childSetCommitCallback("cancel_btn", onCancel, this);
@@ -306,6 +301,8 @@ BOOL LLFloaterModelPreview::postBuild()
childSetAction("ok_btn", onUpload, this);
childDisable("ok_btn");
+ childSetAction("reset_btn", onReset, this);
+
childSetAction("clear_materials", onClearMaterials, this);
childSetCommitCallback("preview_lod_combo", onPreviewLODCommit, this);
@@ -4636,6 +4633,17 @@ void LLFloaterModelPreview::onBrowseLOD(void* data)
}
//static
+void LLFloaterModelPreview::onReset(void* user_data)
+{
+ assert_main_thread();
+
+ LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) user_data;
+ LLModelPreview* mp = fmp->mModelPreview;
+ std::string filename = mp->mLODFile[3];
+ mp->loadModel(filename,3);
+}
+
+//static
void LLFloaterModelPreview::onUpload(void* user_data)
{
assert_main_thread();