From 1ccb583181410ebd0742b0e47047ff74cfadd45c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 1 Apr 2011 16:47:59 -0400
Subject: [PATCH] added defaults button to reset model upload dialog from .dae
file
---
indra/newview/llfloatermodelpreview.cpp | 18 +++++++++++++-----
indra/newview/llfloatermodelpreview.h | 2 ++
.../default/xui/en/floater_model_preview.xml | 2 ++
3 files changed, 17 insertions(+), 5 deletions(-)
mode change 100644 => 100755 indra/newview/llfloatermodelpreview.h
mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_model_preview.xml
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 21c9fca1648..d356e220728 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);
@@ -4618,6 +4615,17 @@ void LLFloaterModelPreview::onBrowseLOD(void* data)
mp->loadModel(mp->mModelPreview->mPreviewLOD);
}
+//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)
{
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
old mode 100644
new mode 100755
index 3fcc1b3e57a..a1f03762e47
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -162,6 +162,8 @@ class LLFloaterModelPreview : public LLFloater
static void onBrowseLOD(void* data);
+ static void onReset(void* data);
+
static void onUpload(void* data);
static void onClearMaterials(void* data);
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
old mode 100644
new mode 100755
index 0053be4f675..23dc28f54ce
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -85,6 +85,8 @@
<text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
+ <button bottom="540" left="300" follows="bottom|right" height="20" label="Defaults"
+ width="80" name="reset_btn" tool_tip="Reset to defaults"/>
<button bottom="540" left="430" follows="bottom|right" height="20" label="Upload"
width="80" name="ok_btn" tool_tip="Upload to simulator"/>
<button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
--
GitLab