summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-15 00:23:36 +0200
committerNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-15 00:23:36 +0200
commit49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch)
tree2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/newview/llpanelpermissions.cpp
parent079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff)
parenta647b8f1cbab13f07ea889c80df28414bc906129 (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
-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);
}