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

FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects.

meow-7.2.2
brad kittenbrink 2011-04-26 15:10:39 -07:00
parent d4b9db012e
commit 2840bff773
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llxml/llcontrol.cpp
View File

@ -839,7 +839,6 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
{
std::string name;
LLSD settings;
LLSD control_map;
llifstream infile;
infile.open(filename);
if(!infile.is_open())
@ -864,7 +863,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
{
bool persist = true;
name = (*itr).first;
control_map = (*itr).second;
LLSD const & control_map = (*itr).second;
if(control_map.has("Persist"))
{