From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 11 May 2008 20:56:42 +0000 Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release --- indra/newview/llfloaterproperties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterproperties.cpp') diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index 74a880e010..09888ebab0 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -441,7 +441,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) perm_string = "G"; perm_string += overwrite_group ? "*: " : ": "; - perm_string += perm_string += mask_to_string(group_mask); + perm_string += mask_to_string(group_mask); childSetText("GroupMaskDebug",perm_string); childSetVisible("GroupMaskDebug",TRUE); -- cgit v1.2.3