diff options
author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/newview/llpanelpermissions.cpp | |
parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) |
Pull merge from lindenlab/viewer-developement
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
-rw-r--r-- | indra/newview/llpanelpermissions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 51ab7649a4..e641370d2e 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -425,7 +425,7 @@ void LLPanelPermissions::refresh() } } - getChildView("button set group")->setEnabled(owners_identical && (mOwnerID == gAgent.getID()) && is_nonpermanent_enforced); + getChildView("button set group")->setEnabled(root_selected && owners_identical && (mOwnerID == gAgent.getID()) && is_nonpermanent_enforced); getChildView("Name:")->setEnabled(TRUE); LLLineEditor* LineEditorObjectName = getChild<LLLineEditor>("Object Name"); |