livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13080 Mac build fix

meow-7.2.2
Andrey Kleshchev 2020-04-24 02:47:18 +03:00
parent c0ed9d28f1
commit 0bc76461fa
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llfloatermodelpreview.cpp
View File

@ -473,7 +473,7 @@ void populate_list_with_overrides(LLScrollListCtrl *listp, const LLJointOverride
return;
}
static const LLSD no_override_placeholder("-"); // LLSD to not conflict in '?'
static const std::string no_override_placeholder = "-";
S32 count = 0;
LLScrollListCell::Params cell_params;
@ -485,13 +485,26 @@ void populate_list_with_overrides(LLScrollListCtrl *listp, const LLJointOverride
std::map<std::string, LLVector3>::const_iterator map_end = data.mPosOverrides.end();
while (map_iter != map_end)
{
add_row_to_list(listp,
cell_params,
LLSD::Integer(count),
map_iter->first,
include_overrides ? map_iter->second.mV[VX] : no_override_placeholder,
include_overrides ? map_iter->second.mV[VY] : no_override_placeholder,
include_overrides ? map_iter->second.mV[VZ] : no_override_placeholder);
if (include_overrides)
{
add_row_to_list(listp,
cell_params,
LLSD::Integer(count),
map_iter->first,
LLSD::Real(map_iter->second.mV[VX]),
LLSD::Real(map_iter->second.mV[VY]),
LLSD::Real(map_iter->second.mV[VZ]));
}
else
{
add_row_to_list(listp,
cell_params,
LLSD::Integer(count),
map_iter->first,
no_override_placeholder,
no_override_placeholder,
no_override_placeholder);
}
count++;
map_iter++;
}