diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
| commit | 91956a0f44bb6a15e4af58dd328e1a0c5bbc0553 (patch) | |
| tree | aac58db318246305e39d0253c1db664b4913126b /indra/llxml | |
| parent | 3039663148b0adc64220964b10cad595e5137cc0 (diff) | |
| parent | e1f2b2b3e82a2415abe9d2c0e548319284e0f2bf (diff) | |
merge
Diffstat (limited to 'indra/llxml')
| -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")) { |