From d625706d84cbb69d99497d3ee328105907867181 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 22 Jun 2011 19:31:03 +0300 Subject: SH-1725 WIP Floater upload model wizard update: - XUI changed according to latest mockups - Added switching to advanced upload floater - Added "Recalculate geometry" and "Recalculate physics" buttons --- indra/newview/llfloatermodelwizard.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index b166d26295..c32977f4b0 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -66,7 +66,6 @@ public: void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost); void modelLoadedCallback(); - void onPhysicsChanged(); void initDecompControls(); LLPhysicsDecomp::decomp_params mDecompParams; @@ -80,13 +79,15 @@ private: CHOOSE_FILE = 0, OPTIMIZE, PHYSICS, - PHYSICS2, REVIEW, UPLOAD }; void setState(int state); void updateButtons(); + void onClickSwitchToAdvanced(); + void onClickRecalculateGeometry(); + void onClickRecalculatePhysics(); void onClickCancel(); void onClickBack(); void onClickNext(); @@ -94,7 +95,6 @@ private: bool onEnableBack(); void loadModel(); void onPreviewLODCommit(LLUICtrl*); - void onAccuracyPerformance(const LLSD& data); void onUpload(); LLModelPreview* mModelPreview; @@ -106,7 +106,11 @@ private: U32 mLastEnabledState; - + LLButton* mRecalculateGeometryBtn; + LLButton* mRecalculatePhysicsBtn; + LLButton* mRecalculatingPhysicsBtn; + LLButton* mCalculateWeightsBtn; + LLButton* mCalculatingWeightsBtn; }; -- cgit v1.2.3 From c5a60ba865e593d4028fcf22322c07b6aa7f94ce Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Tue, 28 Jun 2011 18:14:17 +0300 Subject: SH-1725 WIP Fixed model preview panels cursor change. --- indra/newview/llfloatermodelwizard.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index c32977f4b0..409451e1b6 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -68,6 +68,8 @@ public: void modelLoadedCallback(); void initDecompControls(); + const LLRect& getPreviewRect() const { return mPreviewRect; } + LLPhysicsDecomp::decomp_params mDecompParams; std::set > mCurRequest; std::string mStatusMessage; @@ -111,6 +113,10 @@ private: LLButton* mRecalculatingPhysicsBtn; LLButton* mCalculateWeightsBtn; LLButton* mCalculatingWeightsBtn; + + LLView* mChooseFilePreviewPanel; + LLView* mOptimizePreviewPanel; + LLView* mPhysicsPreviewPanel; }; -- cgit v1.2.3 From fc6f0f31be53d6adbc8e364ffdd4119943312578 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Wed, 29 Jun 2011 17:22:18 +0300 Subject: 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 --- indra/newview/llfloatermodelwizard.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 409451e1b6..9930e0c4e6 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -30,12 +30,13 @@ #include "llmeshrepository.h" #include "llmodel.h" #include "llthread.h" +#include "llfloatermodeluploadbase.h" class LLModelPreview; -class LLFloaterModelWizard : public LLFloater +class LLFloaterModelWizard : public LLFloaterModelUploadBase { public: @@ -62,12 +63,20 @@ public: BOOL handleMouseDown(S32 x, S32 y, MASK mask); BOOL handleMouseUp(S32 x, S32 y, MASK mask); BOOL handleHover(S32 x, S32 y, MASK mask); - BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + + /*virtual*/ void onOpen(const LLSD& key); void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost); void modelLoadedCallback(); void initDecompControls(); + // shows warning message if agent has no permissions to upload model + void onPermReceived(const LLSD& result); + + // called when error occurs during permissions request + void setPermErrorStatus(U32 status, const std::string& reason); + const LLRect& getPreviewRect() const { return mPreviewRect; } LLPhysicsDecomp::decomp_params mDecompParams; -- cgit v1.2.3 From e4b12b83e8721e0856af0305f6cee46cd6092024 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Wed, 29 Jun 2011 22:03:29 +0300 Subject: SH-1725 WIP Added upload permissions and fee requests to Upload Model Wizard. - Enabled warning for users without upload permissions. - Enabled "Calculate weights & fee" button. - Temporarily enabled to upload meshes if upload permission capability request has failed. --- indra/newview/llfloatermodelwizard.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 9930e0c4e6..0b6ee451e1 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -72,10 +72,14 @@ public: void initDecompControls(); // shows warning message if agent has no permissions to upload model - void onPermReceived(const LLSD& result); + /*virtual*/ void onPermissionsReceived(const LLSD& result); // called when error occurs during permissions request - void setPermErrorStatus(U32 status, const std::string& reason); + /*virtual*/ void setPermissonsErrorStatus(U32 status, const std::string& reason); + + /*virtual*/ void onModelPhysicsFeeReceived(F64 physics, S32 fee, std::string upload_url); + + /*virtual*/ void setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason); const LLRect& getPreviewRect() const { return mPreviewRect; } @@ -99,6 +103,7 @@ private: void onClickSwitchToAdvanced(); void onClickRecalculateGeometry(); void onClickRecalculatePhysics(); + void onClickCalculateUploadFee(); void onClickCancel(); void onClickBack(); void onClickNext(); -- cgit v1.2.3 From 93d6c921c9ca45241983096a4eb8b199c347d59c Mon Sep 17 00:00:00 2001 From: seth_productengine Date: Thu, 30 Jun 2011 16:37:43 +0300 Subject: SH-1725 WIP Fixed "Upload" button to be enabled only after recalculating the upload fee and weight. --- indra/newview/llfloatermodelwizard.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 0b6ee451e1..6821e8b908 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -69,6 +69,7 @@ public: void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost); void modelLoadedCallback(); + void modelChangedCallback(); void initDecompControls(); // shows warning message if agent has no permissions to upload model -- cgit v1.2.3 From 87458cd714cd5b12057b8f61dfc8000df176458f Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Thu, 30 Jun 2011 19:12:27 +0300 Subject: SH-1725 WIP Fixed model wizard making multiple calls to upload permissions check. Fixed truncated warning text. --- indra/newview/llfloatermodelwizard.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 6821e8b908..7057189f86 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -65,8 +65,6 @@ public: BOOL handleHover(S32 x, S32 y, MASK mask); BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); - /*virtual*/ void onOpen(const LLSD& key); - void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost); void modelLoadedCallback(); void modelChangedCallback(); -- cgit v1.2.3 From 17060f4e92b12ab74a1b570cd9ee4d1543fb23d1 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 30 Jun 2011 15:55:19 -0400 Subject: SH-1332 Remaining mesh wizard upload work adding observer classes for the upload step so we don't move to success state until upload succeeds. --- indra/newview/llfloatermodelwizard.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index 0b6ee451e1..202463c992 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -81,6 +81,10 @@ public: /*virtual*/ void setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason); + /*virtual*/ void onModelUploadSuccess(); + + /*virtual*/ void onModelUploadFailure(); + const LLRect& getPreviewRect() const { return mPreviewRect; } LLPhysicsDecomp::decomp_params mDecompParams; -- cgit v1.2.3 From 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Sat, 9 Jul 2011 14:58:14 -0700 Subject: Fix for SH-2028. Also fixed layout issues with new upload warning and upload price text when floater is resized. --- indra/newview/llfloatermodelwizard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloatermodelwizard.h') diff --git a/indra/newview/llfloatermodelwizard.h b/indra/newview/llfloatermodelwizard.h index ea60cf5db8..db9b605777 100644 --- a/indra/newview/llfloatermodelwizard.h +++ b/indra/newview/llfloatermodelwizard.h @@ -76,7 +76,7 @@ public: // called when error occurs during permissions request /*virtual*/ void setPermissonsErrorStatus(U32 status, const std::string& reason); - /*virtual*/ void onModelPhysicsFeeReceived(F64 physics, S32 fee, std::string upload_url); + /*virtual*/ void onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url); /*virtual*/ void setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason); -- cgit v1.2.3