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.

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 743a8d53ed..31c2d34b8d 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -577,13 +577,14 @@ public:
 		mThread->mPendingUploads--;
 		dump_llsd_to_file(cc,make_dump_name("whole_model_fee_response_",dump_num));
 
+		LLWholeModelFeeObserver* observer = mObserverHandle.get();
+
 		if (isGoodStatus(status) &&
 			cc["state"].asString() == "upload")
 		{
 			llinfos << "fee request succeeded" << llendl;
 			mThread->mWholeModelUploadURL = cc["uploader"].asString();
 
-			LLWholeModelFeeObserver* observer = mObserverHandle.get();
 			if (observer)
 			{
 				S32 fee = cc["upload_price"].asInteger();
@@ -597,6 +598,11 @@ public:
 			llwarns << "fee request failed" << llendl;
 			log_upload_error(status,cc,"fee",mModelData["name"]);
 			mThread->mWholeModelUploadURL = "";
+
+			if (observer)
+			{
+				observer->setModelPhysicsFeeErrorStatus(status, reason);
+			}
 		}
 	}