summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-14 09:05:55 -0500
committerOz Linden <oz@lindenlab.com>2013-02-14 09:05:55 -0500
commitc880c961bb2a0838bc529efc07cfeb12f5636d88 (patch)
treebeff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llpanelpermissions.cpp
parent841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff)
parente87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff)
merge changes for 3.4.5
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");