diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
| commit | 525de5554022b946641db446a5b5153f9e670e10 (patch) | |
| tree | d7d679724515f6eb839f87161510ba0a0d06c89b /indra/newview/llpanelpermissions.cpp | |
| parent | 219cd6ecda60e1c48852f582f0994573fd0e10ae (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
| -rw-r--r-- | indra/newview/llpanelpermissions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index e35574be6c..59130236f2 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -379,7 +379,7 @@ void LLPanelPermissions::refresh() if (mLabelGroupName) { mLabelGroupName->setNameID(LLUUID::null, TRUE); - mLabelGroupName->refresh(LLUUID::null,LLStringUtil::null, LLStringUtil::null, TRUE); + mLabelGroupName->refresh(LLUUID::null, std::string(), true); mLabelGroupName->setEnabled(FALSE); } } |