summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-01 17:03:59 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-04-01 17:03:59 -0700
commitb1ae22c3eb71767219ebb96ec80011e10bbfabbe (patch)
tree41eb0fd5eb7f4986f99ce2a0d11273c32f33e7d1 /indra/newview/llpanelpermissions.cpp
parentf17cfd952a274cc6c684e50db004d62373a49d1f (diff)
parent9bdbc10aba78d7c6fec832ee4c411b483f05c441 (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);