diff options
| author | seth_productengine <none@none> | 2011-07-22 22:40:18 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-07-22 22:40:18 +0300 |
| commit | 50b9c63382121df879680cf43f5be6fc09686607 (patch) | |
| tree | 0c719c97d8d2beb802b3845505a5af0985a57e81 /indra/newview/llfloatermodelpreview.cpp | |
| parent | aa40614cd4cf05d3d8e78be2e05a0f5cdcfde5cc (diff) | |
SH-1868 WIP Added user-supplied metric data for uploading a model.
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index e045cf6729..6c01f0c09a 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3098,6 +3098,7 @@ void LLModelPreview::rebuildUploadData() std::string requested_name = mFMP->getChild<LLUICtrl>("description_form")->getValue().asString(); + std::string metric = mFMP->getChild<LLUICtrl>("model_category_combo")->getValue().asString(); LLSpinCtrl* scale_spinner = mFMP->getChild<LLSpinCtrl>("import_scale"); @@ -3159,6 +3160,7 @@ void LLModelPreview::rebuildUploadData() if (base_model) { base_model->mRequestedLabel = requested_name; + base_model->mMetric = metric; } S32 idx = 0; @@ -5593,6 +5595,10 @@ void LLFloaterModelPreview::onPermissionsReceived(const LLSD& result) mUploadBtn->setEnabled(mHasUploadPerm && !mUploadModelUrl.empty()); getChild<LLTextBox>("warning_title")->setVisible(!mHasUploadPerm); getChild<LLTextBox>("warning_message")->setVisible(!mHasUploadPerm); + + // Hide the accounting info if upload is not permitted. + getChild<LLTextBox>("weights_text")->setVisible(mHasUploadPerm); + getChild<LLTextBox>("weights")->setVisible(mHasUploadPerm); } void LLFloaterModelPreview::setPermissonsErrorStatus(U32 status, const std::string& reason) |