summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-11-12 17:11:47 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-11-12 17:11:47 -0500
commit8863987cae0354db6d248633f33787bdf62293ca (patch)
treee5d03818d172cc22a2f7be5120d26413d02cdd2f /indra
parent7a45dec2d540581ef080386e4a967befd22b6adb (diff)
EXT-2354 menus contain multiple lines not editable in XUI
We're building a pie menu in code, complete with separators for this particular branch of submenus. This is terrible and ugly and needs to be killed, but for now I removed the lines that cause the separators to be added where there are empty pie slices. Code reviewed by Vir
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoavatarself.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 185274d40d..94081ada55 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -487,18 +487,10 @@ BOOL LLVOAvatarSelf::buildMenus()
}
// add in requested order to pie menu, inserting separators as necessary
- S32 cur_pie_slice = 0;
for (std::multimap<S32, S32>::iterator attach_it = attachment_pie_menu_map.begin();
attach_it != attachment_pie_menu_map.end(); ++attach_it)
{
- S32 requested_pie_slice = attach_it->first;
S32 attach_index = attach_it->second;
- while (cur_pie_slice < requested_pie_slice)
- {
- gAttachBodyPartPieMenus[group]->addSeparator();
- gDetachBodyPartPieMenus[group]->addSeparator();
- cur_pie_slice++;
- }
LLViewerJointAttachment* attachment = get_if_there(mAttachmentPoints, attach_index, (LLViewerJointAttachment*)NULL);
if (attachment)
@@ -520,7 +512,6 @@ BOOL LLVOAvatarSelf::buildMenus()
item_params.on_enable.parameter = attach_index;
item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
gDetachBodyPartPieMenus[group]->addChild(item);
- cur_pie_slice++;
}
}
}