diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-04-26 15:10:39 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-04-26 15:10:39 -0700 |
| commit | 2840bff7734fc7888da804d7aad4e9f252f33872 (patch) | |
| tree | e077da6fcedcfbc12c6f310169337b5bf96b48d0 /indra | |
| parent | d4b9db012e2b5195759f694792c392770112b42d (diff) | |
FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 6e4364a20d..a604c1e631 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -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")) { |