summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-02 12:51:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-04-02 12:51:39 -0400
commit5faa2444f91a65b3dfcd2047e578a54226be8577 (patch)
tree05b7468bc6b721d8f8e90cbb77a8f2f8a74ba152 /indra/newview/llpanelpermissions.cpp
parenta3ba5836f0b24a0b2c3aeff3b97bb88a133ea69c (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
merge
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
-rw-r--r--indra/newview/llpanelpermissions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 01b6e8ffad..71d16a08b4 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -195,8 +195,8 @@ void LLPanelPermissions::disableAll()
childSetEnabled("Owner Name", FALSE);
childSetEnabled("Group:", FALSE);
- childSetText("Group Name", LLStringUtil::null);
- childSetEnabled("Group Name", FALSE);
+ childSetText("Group Name Proxy", LLStringUtil::null);
+ childSetEnabled("Group Name Proxy", FALSE);
childSetEnabled("button set group", FALSE);
childSetText("Object Name", LLStringUtil::null);