summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-14 14:03:16 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-14 14:03:16 -0700
commit508686047d5e98934d5fefbb576e54f108df6fe3 (patch)
tree6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/newview/llpanelpermissions.cpp
parent2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff)
parentf53f6f20df5c99311103c3d92938ce878d474f13 (diff)
Merge from http://hg.secondlife.com/viewer-identity (display names)
Diffstat (limited to 'indra/newview/llpanelpermissions.cpp')
-rw-r--r--indra/newview/llpanelpermissions.cpp2
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);
}
}