diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 19:13:17 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 19:13:17 -0700 |
| commit | 42fe138cbb1af4acbb6851711f8c7f86c65795c0 (patch) | |
| tree | af71f51ac4ed44f8064623e9b43c91e433d15f5d /indra/llxml/llcontrol.cpp | |
| parent | 2840bff7734fc7888da804d7aad4e9f252f33872 (diff) | |
Incorporated some suggestions from code review for VWR-25610
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index a604c1e631..0809d95628 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -837,7 +837,6 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values) { - std::string name; LLSD settings; llifstream infile; infile.open(filename); @@ -862,8 +861,8 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v for(LLSD::map_const_iterator itr = settings.beginMap(); itr != settings.endMap(); ++itr) { bool persist = true; - name = (*itr).first; - LLSD const & control_map = (*itr).second; + std::string const & name = itr->first; + LLSD const & control_map = itr->second; if(control_map.has("Persist")) { |