diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llpanelpermissions.cpp | |
parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) |
merge changes for DRTVWR-276
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"); |