diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-05 15:39:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-05 15:39:18 -0700 |
| commit | 62b1791d7a3aaed34b39e5bad53389ef312ccad8 (patch) | |
| tree | 00670baf845fd1eea26670109b48dc8fab35dae9 /indra/llxml/llcontrol.cpp | |
| parent | ebda8f883b742de82db74cab993612737f5dec9e (diff) | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
Merged latest lindenlab/viewer-development with brad_linden/viewer-mustbuildfaster-0.
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")) { |