summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-01 17:54:08 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-01 17:54:08 -0400
commit2854008e8edd3419fe37a8c4971223eda5945bfa (patch)
tree83640a42fcc5f71200a19e173a95da433760cf74 /indra/newview/llpanelpermissions.cpp
parent1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff)
parent406b595e8c6811c2550340ba316328289d8b856f (diff)
automated 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);