diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
| commit | 00c5628074dff2a687d737bc30e9dbe2a1ccfbf8 (patch) | |
| tree | ad6819435b956dee23c6463d69fe26caa89d912d /indra/llxml/llcontrol.cpp | |
| parent | 11f988cd09daa8f33a21b7f82201e4b59e8a04ad (diff) | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
Merge lindenlab/viewer-development
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")) { |