summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-11-07 16:29:32 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-11-07 16:29:32 +0200
commit815cfa50607f122a455322febd77dfc6cf2ae079 (patch)
tree6dc0e1e042fbb6ca8b2ce7f519c04f23b72b67e1 /indra/newview
parent811878df666f5a115d7715639d618877ed4de44a (diff)
MAINT-1333 FIXED Disable "for sale" controls for attached prim
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llpanelpermissions.cpp8
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);
}