From 0c05ea2740b63c824fba2bab37f67ca2188f0d07 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 29 Jun 2011 15:14:49 -0400 Subject: Fixes for upload permission checking problems --- indra/newview/llfloatermodelpreview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 indra/newview/llfloatermodelpreview.cpp (limited to 'indra/newview/llfloatermodelpreview.cpp') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp old mode 100644 new mode 100755 index ea85dc0052..00cc81c5d6 --- 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("warning_title")->setVisible(mHasUploadPerm); - getChild("warning_message")->setVisible(mHasUploadPerm); + getChild("warning_title")->setVisible(!mHasUploadPerm); + getChild("warning_message")->setVisible(!mHasUploadPerm); } void LLFloaterModelPreview::setPermErrorStatus(U32 status, const std::string& reason) -- cgit v1.2.3