diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
| commit | d631f2fd4daed5e3b10fc6dc290aa16f3d0591f0 (patch) | |
| tree | afc5139a2d530bdca9233308d2b6d6d4532bc6c4 /indra/newview/llpanelpermissions.cpp | |
| parent | 5411f349e5ed8835d5c99dbfb19a0934a6e5e28f (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rwxr-xr-x | indra/newview/llpanelpermissions.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 58055d98c6..ce9231d6f2 100755 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -851,6 +851,14 @@ void LLPanelPermissions::refresh() combo_click_action->setValue(LLSD(combo_value)); } } + + if(LLSelectMgr::getInstance()->getSelection()->isAttachment()) + { + getChildView("checkbox for sale")->setEnabled(FALSE); + getChildView("Edit Cost")->setEnabled(FALSE); + getChild<LLComboBox>("sale type")->setEnabled(FALSE); + } + getChildView("label click action")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume); getChildView("clickaction")->setEnabled(is_perm_modify && is_nonpermanent_enforced && all_volume); } |