diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-07 10:11:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-07 10:11:40 -0400 |
| commit | 510283ce83f152a01887b535f24b29cf2ee95968 (patch) | |
| tree | 8134c989050501958bd66a88a5554378977af793 /indra/llxml/llcontrol.cpp | |
| parent | d892256d5ba142bb8ea7ef11f64c67a498e725e9 (diff) | |
| parent | a941a376274b80212ed0624539578816d7960bb9 (diff) | |
storm-1237: merge experience team issues
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")) { |