diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-03-22 16:22:24 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-03-22 16:22:24 +0200 |
commit | ccbff3f75aa704c6670524756c5afa0269b21487 (patch) | |
tree | 01db3f89c78689608b756c63dac7850f71717cc2 /indra/newview | |
parent | 35552f48694f5879fdd4d049c67063168f16245e (diff) | |
parent | 5e0de9609d7a18af31241565f3a56ac906612fcb (diff) |
Merge heads
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llpanelpermissions.cpp | 4 |
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); |