diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-06-30 19:58:27 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-06-30 19:58:27 +0300 |
| commit | 06b1202747c07409c877cb89432f0df0bfacba47 (patch) | |
| tree | 449a2259c8924de745f033f526ca49706edb8ec9 /indra/newview | |
| parent | 87458cd714cd5b12057b8f61dfc8000df176458f (diff) | |
- SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to accommodate upload fee & prim equivalency)
added the link for "Find out how" in warning text of advanced upload floater
advanced upload, button returns to "get fees" whenever any option that affects price changes
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 5a1cd9091a..7587cf0459 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -397,6 +397,10 @@ BOOL LLFloaterModelPreview::postBuild() childSetCommitCallback("border_mode", onLODParamCommit, this); childSetCommitCallback("share_tolerance", onLODParamCommit, this); + childSetCommitCallback("upload_skin", boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this), NULL); + childSetCommitCallback("upload_joints", boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this), NULL); + childSetCommitCallback("upload_textures", boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this), NULL); + childSetTextArg("status", "[STATUS]", getString("status_idle")); //childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); @@ -5417,6 +5421,11 @@ void LLFloaterModelPreview::setStatusMessage(const std::string& msg) mStatusMessage = msg; } +void LLFloaterModelPreview::toggleCalculateButton() +{ + toggleCalculateButton(true); +} + void LLFloaterModelPreview::toggleCalculateButton(bool visible) { mCalculateBtn->setVisible(visible); diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 7f27da4699..eccc9ce1b6 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -273,6 +273,7 @@ protected: private: void onClickCalculateBtn(); + void toggleCalculateButton(); // Toggles between "Calculate weights & fee" and "Upload" buttons. void toggleCalculateButton(bool visible); diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index e5f60ea482..7f15de7236 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -93,7 +93,7 @@ top_pad="5" wrap="true" visible="false"> - You will not be able to complete the final upload of this model to the Second Life servers. Find out how to get certifed for mesh model uploads. + You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get certifed for mesh model uploads. </text> <tab_container |