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/lluploadfloaterobservers.h | 79 ++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 indra/newview/lluploadfloaterobservers.h (limited to 'indra/newview/lluploadfloaterobservers.h') diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h new file mode 100644 index 0000000000..f27687e12e --- /dev/null +++ b/indra/newview/lluploadfloaterobservers.h @@ -0,0 +1,79 @@ +/** + * @file lluploadfloaterobservers.h + * @brief LLUploadModelPremissionsResponder declaration + * + * $LicenseInfo:firstyear=2011&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2011, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LLUPLOADFLOATEROBSERVERS_H_ +#define LLUPLOADFLOATEROBSERVERS_H_ + +#include "llfloater.h" +#include "llhttpclient.h" +#include "llhandle.h" + +class LLUploadPermissionsObserver +{ +public: + + LLUploadPermissionsObserver(){mUploadPermObserverHandle.bind(this);} + virtual ~LLUploadPermissionsObserver() {} + + virtual void onPermReceived(const LLSD& result) = 0; + virtual void setPermErrorStatus(U32 status, const std::string& reason) = 0; + + LLHandle getPermObserverHandle() const {return mUploadPermObserverHandle;} + +protected: + LLRootHandle mUploadPermObserverHandle; +}; + +class LLWholeModelFeeObserver +{ +public: + LLWholeModelFeeObserver() { mWholeModelFeeObserverHandle.bind(this); } + virtual ~LLWholeModelFeeObserver() {} + + virtual void onModelPhysicsFeeReceived(F64 physics, S32 fee, std::string upload_url) = 0; + virtual void setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason) = 0; + + LLHandle getWholeModelFeeObserverHandle() const { return mWholeModelFeeObserverHandle; } + +protected: + LLRootHandle mWholeModelFeeObserverHandle; +}; + +class LLUploadModelPremissionsResponder : public LLHTTPClient::Responder +{ +public: + + LLUploadModelPremissionsResponder(const LLHandle& observer); + + void error(U32 status, const std::string& reason); + + void result(const LLSD& content); + +private: + LLHandle mObserverHandle; +}; + +#endif /* LLUPLOADFLOATEROBSERVERS_H_ */ -- 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/lluploadfloaterobservers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lluploadfloaterobservers.h') diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index f27687e12e..23206549e7 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -38,8 +38,8 @@ public: LLUploadPermissionsObserver(){mUploadPermObserverHandle.bind(this);} virtual ~LLUploadPermissionsObserver() {} - virtual void onPermReceived(const LLSD& result) = 0; - virtual void setPermErrorStatus(U32 status, const std::string& reason) = 0; + virtual void onPermissionsReceived(const LLSD& result) = 0; + virtual void setPermissonsErrorStatus(U32 status, const std::string& reason) = 0; LLHandle getPermObserverHandle() const {return mUploadPermObserverHandle;} -- cgit v1.2.3 From c7bbe8e63149af214175bffcf4d3710654584c1d Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Thu, 30 Jun 2011 15:38:58 +0300 Subject: SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to accomodate upload fee & prim equivilancy) - Added a signal on model change to initiate recalculating (calculate phys&fee button is shown again) - Show 'calculate phys&fee' button on fee request error --- indra/newview/lluploadfloaterobservers.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lluploadfloaterobservers.h') diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index 23206549e7..fb4be72378 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -24,8 +24,8 @@ * $/LicenseInfo$ */ -#ifndef LLUPLOADFLOATEROBSERVERS_H_ -#define LLUPLOADFLOATEROBSERVERS_H_ +#ifndef LL_LLUPLOADFLOATEROBSERVERS_H +#define LL_LLUPLOADFLOATEROBSERVERS_H #include "llfloater.h" #include "llhttpclient.h" @@ -76,4 +76,4 @@ private: LLHandle mObserverHandle; }; -#endif /* LLUPLOADFLOATEROBSERVERS_H_ */ +#endif /* LL_LLUPLOADFLOATEROBSERVERS_H */ -- 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/lluploadfloaterobservers.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'indra/newview/lluploadfloaterobservers.h') diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index 23206549e7..9a38db837c 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -62,6 +62,24 @@ protected: LLRootHandle mWholeModelFeeObserverHandle; }; + +class LLWholeModelUploadObserver +{ +public: + LLWholeModelUploadObserver() { mWholeModelUploadObserverHandle.bind(this); } + virtual ~LLWholeModelUploadObserver() {} + + virtual void onModelUploadSuccess() = 0; + + virtual void onModelUploadFailure() = 0; + + LLHandle getWholeModelUploadObserverHandle() const { return mWholeModelUploadObserverHandle; } + +protected: + LLRootHandle mWholeModelUploadObserverHandle; +}; + + class LLUploadModelPremissionsResponder : public LLHTTPClient::Responder { public: -- 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/lluploadfloaterobservers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lluploadfloaterobservers.h') diff --git a/indra/newview/lluploadfloaterobservers.h b/indra/newview/lluploadfloaterobservers.h index c912c9755a..79aad282d7 100644 --- a/indra/newview/lluploadfloaterobservers.h +++ b/indra/newview/lluploadfloaterobservers.h @@ -53,7 +53,7 @@ public: LLWholeModelFeeObserver() { mWholeModelFeeObserverHandle.bind(this); } virtual ~LLWholeModelFeeObserver() {} - virtual void onModelPhysicsFeeReceived(F64 physics, S32 fee, std::string upload_url) = 0; + virtual void onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url) = 0; virtual void setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason) = 0; LLHandle getWholeModelFeeObserverHandle() const { return mWholeModelFeeObserverHandle; } -- cgit v1.2.3