SH-1726 FIXED (Viewer modifications to advanced model upload to accommodate upload fee & prim equivalency)

- Changed XUI according to the spec
- Added requesting upload permission, physics weight and fee weight
- Split requesting fee and uploading model steps in mesh repository

1 files changed, 18 insertions, 2 deletions

diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp
index 97b54c4c74..3c0ce96864 100644
--- a/indra/newview/llfloatermodelwizard.cpp
+++ b/indra/newview/llfloatermodelwizard.cpp
@@ -52,7 +52,7 @@ static	const std::string stateNames[]={
 static void swap_controls(LLUICtrl* first_ctrl, LLUICtrl* second_ctrl, bool first_ctr_visible);
 
 LLFloaterModelWizard::LLFloaterModelWizard(const LLSD& key)
-	: LLFloater(key)
+	: LLFloaterModelUploadBase(key)
 	 ,mRecalculateGeometryBtn(NULL)
 	 ,mRecalculatePhysicsBtn(NULL)
 	 ,mRecalculatingPhysicsBtn(NULL)
@@ -396,6 +396,13 @@ BOOL LLFloaterModelWizard::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return TRUE;
 }
 
+
+/*virtual*/
+void LLFloaterModelWizard::onOpen(const LLSD& key)
+{
+	requestAgentUploadPermissions();
+}
+
 void LLFloaterModelWizard::initDecompControls()
 {
 	LLSD key;
@@ -453,6 +460,15 @@ void LLFloaterModelWizard::initDecompControls()
 	mDecompParams["Simplify Method"] = 0; // set it to retain %
 }
 
+void LLFloaterModelWizard::onPermReceived(const LLSD& result)
+{
+}
+
+void LLFloaterModelWizard::setPermErrorStatus(U32 status, const std::string& reason)
+{
+	llwarns << "LLFloaterModelWizard::setPermErrors(" << status << " : " << reason << ")" << llendl;
+}
+
 //static
 void LLFloaterModelWizard::executePhysicsStage(std::string stage_name)
 {
@@ -623,7 +639,7 @@ void LLFloaterModelWizard::onUpload()
 	mModelPreview->rebuildUploadData();
 	
 	gMeshRepo.uploadModel(mModelPreview->mUploadData, mModelPreview->mPreviewScale, 
-						  true, false, false);
+						  true, false, false, mUploadModelUrl, true);
 	
 	setState(UPLOAD);