Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile, again, oops.

Browse Source
This commit is contained in:
Liru Færs
2019-12-28 04:10:21 -05:00
parent 19bcdae6ac
commit 09926d12bb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llmenugl.cpp
View File

@@ -3194,7 +3194,7 @@ void LLMenuGL::insert(S32 position, LLView* ctrl, bool arrange /*= true*/)
std::advance(position_iter, position);
insert(position_iter, item, arrange);
}
void LLMenuGL::insert(item_list_t::iterator position_iter, LLMenuItemGL* item, bool arrange /*= true*/)
void LLMenuGL::insert(item_list_t::const_iterator position_iter, LLMenuItemGL* item, bool arrange /*= true*/)
{
mItems.insert(position_iter, item);
LLUICtrl::addChild(item);

4
indra/llui/llmenugl.h
View File

@@ -530,10 +530,10 @@ public:
// add new item at position
void insert(S32 begin, LLView* ctrl, bool arrange = true);
void insert(std::list<LLMenuItemGL*>::iterator position_iter, LLMenuItemGL* item, bool arrange = true);
typedef std::list<LLMenuItemGL*> item_list_t;
void insert(item_list_t::const_iterator position_iter, LLMenuItemGL* item, bool arrange = true);
// find an item's position
typedef std::list<LLMenuItemGL*> item_list_t;
item_list_t::const_iterator find(LLMenuItemGL* item) const { return std::find(mItems.begin(), mItems.end(), item); }
// end of items, for use with other members that return an iterator

2
indra/newview/llviewermenu.cpp
View File

@@ -10009,7 +10009,7 @@ void parse_simulator_features()
LLMenuGL* menu = dynamic_cast<LLMenuGL*>(marker->getParent());
if (!menu) continue;
std::list<LLMenuItemGL*>::iterator it = menu->find(marker);
auto it = menu->find(marker);
for (LLSD::map_iterator j = i->second.beginMap(); j != i->second.endMap(); ++j)
{