From 3e299ab7642871b9d687940b1968de98f461892d Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Thu, 2 Sep 2010 18:29:42 +0200 Subject: =?UTF-8?q?VWR-20583=20FIXED=20submenu=20indicators=20(=E2=96=B6?= =?UTF-8?q?=20a.k.a.=20U+25B6)=20shouldn't=20be=20hard-coded=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20in=20context=20menu=20su?= =?UTF-8?q?b=20menu=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the same mechanism for adding the triangle in LLContextMenuBranch as is already used in LLMenuItemBranchGL. As a bonus, the triangles will be nicely right-aligned, just as in the main menu. Remaining hard-coded triangles all are in indra/newview/skins/default/xui/*/panel_voice_effect.xml. --- indra/llui/llmenugl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/llui/llmenugl.cpp') diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index b4a1bcb7c5..e7a6f1e6f6 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3727,8 +3727,7 @@ void LLContextMenuBranch::buildDrawLabel( void ) appendAcceleratorString( st ); mDrawAccelLabel = st; - // No special branch suffix - mDrawBranchLabel.clear(); + mDrawBranchLabel = BRANCH_SUFFIX; } void LLContextMenuBranch::showSubMenu() -- cgit v1.2.3