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

Suppress warnings caused by additional parameters used in namelistitems not being convertible to scrolllistitem params

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 11:54:05 -04:00
parent 887efcea14
commit fcfa488cb5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llnamelistctrl.cpp
View File

@@ -177,8 +177,12 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos
} }
LLScrollListItem* LLNameListCtrl::addNameItemRow(const LLSD& value, EAddPosition pos, void* userdata) LLScrollListItem* LLNameListCtrl::addNameItemRow(const LLSD& value, EAddPosition pos, void* userdata)
{ {
// Singu Note: ScrollLists don't use "target" or "suffix", for now, just remove them
LLSD scroll_value = value;
scroll_value.erase("target");
scroll_value.erase("suffix");
LLScrollListItem* item = LLScrollListCtrl::addElement(value, pos, userdata); LLScrollListItem* item = LLScrollListCtrl::addElement(scroll_value, pos, userdata);
if (!item) return NULL; if (!item) return NULL;
LLUUID id = item->getUUID(); LLUUID id = item->getUUID();