summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-18 14:30:57 -0400
committerOz Linden <oz@lindenlab.com>2013-03-18 14:30:57 -0400
commited7785bf97a601448ba2da5fb2f19ea2861454c5 (patch)
tree17e8d9ccf28ae30c5029ecea7e0ab8bed0fe3926 /indra/newview/llpanelpermissions.cpp
parentc8533650b4779040c5e196f9ff156e3454edc9c8 (diff)
parentbf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff)
merge up to 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
-rw-r--r--indra/newview/llpanelpermissions.cpp2
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");