Skip to content
Snippets Groups Projects
Commit 2840bff7 authored by brad kittenbrink's avatar brad kittenbrink
Browse files

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

parent d4b9db01
No related branches found
No related tags found
No related merge requests found
......@@ -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"))
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment