diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:09:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:09:49 -0400 |
| commit | 30cd9f7d475f67a65490774ab6d5a932c380494c (patch) | |
| tree | 52a1e9e91253e401a049cfc485af10d1d14fffb4 /indra/llxml/llcontrol.cpp | |
| parent | 1aee76cf57de2a206bfa464257b1af44acc3fc9c (diff) | |
| parent | 032e5d30c07b77402c9f38365a5b2d424ae25271 (diff) | |
merge changes for storm-1141
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 6e4364a20d..0809d95628 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -837,9 +837,7 @@ 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; - LLSD control_map; llifstream infile; infile.open(filename); if(!infile.is_open()) @@ -863,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; - control_map = (*itr).second; + std::string const & name = itr->first; + LLSD const & control_map = itr->second; if(control_map.has("Persist")) { |