From fcfa488cb57d7c7b19bfb6093f84ebe6b95178bf Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 16 Jul 2013 11:54:05 -0400 Subject: [PATCH] Suppress warnings caused by additional parameters used in namelistitems not being convertible to scrolllistitem params --- indra/newview/llnamelistctrl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 38b9e5e2e..484b19a80 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -177,8 +177,12 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos } 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; LLUUID id = item->getUUID();