Fixes for upload permission checking problems

2 files changed, 9 insertions, 3 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index ea85dc0052..00cc81c5d6 100644..100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -5489,14 +5489,18 @@ void LLFloaterModelPreview::DecompRequest::completed()
 	}
 }
 
+void dump_llsd_to_file(const LLSD& content, std::string filename);
+
 void LLFloaterModelPreview::onPermReceived(const LLSD& result)
 {
+	dump_llsd_to_file(result,"perm_received.xml");
 	std::string upload_status = result["mesh_upload_status"].asString();
-	mHasUploadPerm = "valid" == upload_status;
+	// BAP HACK: handle "" for case that  MeshUploadFlag cap is broken.
+	mHasUploadPerm = (("" == upload_status) || ("valid" == upload_status));
 
 	mUploadBtn->setEnabled(mHasUploadPerm);
-	getChild<LLTextBox>("warning_title")->setVisible(mHasUploadPerm);
-	getChild<LLTextBox>("warning_message")->setVisible(mHasUploadPerm);
+	getChild<LLTextBox>("warning_title")->setVisible(!mHasUploadPerm);
+	getChild<LLTextBox>("warning_message")->setVisible(!mHasUploadPerm);
 }
 
 void LLFloaterModelPreview::setPermErrorStatus(U32 status, const std::string& reason)
diff --git a/indra/newview/llfloatermodeluploadbase.cpp b/indra/newview/llfloatermodeluploadbase.cpp
index 56c6447792..6d3800bfa4 100644
--- a/indra/newview/llfloatermodeluploadbase.cpp
+++ b/indra/newview/llfloatermodeluploadbase.cpp
@@ -52,5 +52,7 @@ void LLFloaterModelUploadBase::requestAgentUploadPermissions()
 		LLSD args;
 		args["CAPABILITY"] = capability;
 		LLNotificationsUtil::add("RegionCapabilityRequestError", args);
+		// BAP HACK avoid being blocked by broken server side stuff
+		mHasUploadPerm = true;
 	}
 }